Unverified Commit 009a9617 authored by Dominik Charousset's avatar Dominik Charousset Committed by GitHub

Merge pull request #643

Fix build for mingw (mxe)
parents b653cc93 32fb68b0
...@@ -316,7 +316,7 @@ if(MINGW) ...@@ -316,7 +316,7 @@ if(MINGW)
add_definitions(-D_WIN32_WINNT=0x0600) add_definitions(-D_WIN32_WINNT=0x0600)
add_definitions(-DWIN32) add_definitions(-DWIN32)
include(GenerateExportHeader) include(GenerateExportHeader)
set(LD_FLAGS "ws2_32 -liphlpapi") set(LD_FLAGS "ws2_32 -liphlpapi -lpsapi")
# build static to avoid runtime dependencies to GCC libraries # build static to avoid runtime dependencies to GCC libraries
set(EXTRA_FLAGS "${EXTRA_FLAGS} -static") set(EXTRA_FLAGS "${EXTRA_FLAGS} -static")
elseif(CYGWIN) elseif(CYGWIN)
......
...@@ -4,11 +4,15 @@ ...@@ -4,11 +4,15 @@
#include <memory> #include <memory>
#include <iostream> #include <iostream>
#include <arpa/inet.h>
#include "caf/all.hpp" #include "caf/all.hpp"
#include "caf/io/all.hpp" #include "caf/io/all.hpp"
#ifdef CAF_WINDOWS
#include <winsock2.h>
#else
#include <arpa/inet.h>
#endif
CAF_PUSH_WARNINGS CAF_PUSH_WARNINGS
#include "pingpong.pb.h" #include "pingpong.pb.h"
CAF_POP_WARNINGS CAF_POP_WARNINGS
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#ifdef WIN32 #ifdef WIN32
# define _WIN32_WINNT 0x0600 # define _WIN32_WINNT 0x0600
# include <Winsock2.h> # include <winsock2.h>
#else #else
# include <arpa/inet.h> // htonl # include <arpa/inet.h> // htonl
#endif #endif
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
#if defined(CAF_MACOS) || defined(CAF_IOS) #if defined(CAF_MACOS) || defined(CAF_IOS)
#include <mach/mach.h> #include <mach/mach.h>
#elif defined(CAF_WINDOWS) #elif defined(CAF_WINDOWS)
#include <Windows.h> #include <windows.h>
#include <Psapi.h> #include <psapi.h>
#else #else
#include <sys/resource.h> #include <sys/resource.h>
#endif #endif
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "caf/config.hpp" #include "caf/config.hpp"
#ifdef CAF_WINDOWS #ifdef CAF_WINDOWS
# include <Windows.h> # include <windows.h>
#else #else
# include <sys/types.h> # include <sys/types.h>
# include <unistd.h> # include <unistd.h>
......
...@@ -24,9 +24,9 @@ ...@@ -24,9 +24,9 @@
#ifdef CAF_WINDOWS #ifdef CAF_WINDOWS
# include <winsock2.h> # include <winsock2.h>
# include <windows.h>
# include <ws2tcpip.h> # include <ws2tcpip.h>
# include <ws2ipdef.h> # include <ws2ipdef.h>
# include <windows.h>
#else #else
# include <unistd.h> # include <unistd.h>
# include <cerrno> # include <cerrno>
...@@ -209,12 +209,12 @@ std::string host(const ip_endpoint& ep) { ...@@ -209,12 +209,12 @@ std::string host(const ip_endpoint& ep) {
switch(ep.caddress()->sa_family) { switch(ep.caddress()->sa_family) {
case AF_INET: case AF_INET:
inet_ntop(AF_INET, inet_ntop(AF_INET,
&reinterpret_cast<const sockaddr_in*>(ep.caddress())->sin_addr, &const_cast<sockaddr_in*>(reinterpret_cast<const sockaddr_in*>(ep.caddress()))->sin_addr,
addr, static_cast<socklen_t>(*ep.clength())); addr, static_cast<socklen_t>(*ep.clength()));
break; break;
case AF_INET6: case AF_INET6:
inet_ntop(AF_INET6, inet_ntop(AF_INET6,
&reinterpret_cast<const sockaddr_in6*>(ep.caddress())->sin6_addr, &const_cast<sockaddr_in6*>(reinterpret_cast<const sockaddr_in6*>(ep.caddress()))->sin6_addr,
addr, static_cast<socklen_t>(*ep.clength())); addr, static_cast<socklen_t>(*ep.clength()));
break; break;
default: default:
......
...@@ -15,6 +15,9 @@ set (LIBCAF_OPENSSL_SRCS ...@@ -15,6 +15,9 @@ set (LIBCAF_OPENSSL_SRCS
add_custom_target(libcaf_openssl) add_custom_target(libcaf_openssl)
if (MINGW)
set(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} -lz)
endif()
# build shared library if not compiling static only # build shared library if not compiling static only
if (NOT CAF_BUILD_STATIC_ONLY) if (NOT CAF_BUILD_STATIC_ONLY)
add_library(libcaf_openssl_shared SHARED add_library(libcaf_openssl_shared SHARED
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment