Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
32fb68b0
Commit
32fb68b0
authored
Dec 27, 2017
by
rkfg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix build for mingw (mxe)
parent
463ebbfe
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
17 additions
and
10 deletions
+17
-10
CMakeLists.txt
CMakeLists.txt
+1
-1
examples/broker/protobuf_broker.cpp
examples/broker/protobuf_broker.cpp
+6
-2
examples/broker/simple_broker.cpp
examples/broker/simple_broker.cpp
+1
-1
libcaf_core/caf/scheduler/profiled_coordinator.hpp
libcaf_core/caf/scheduler/profiled_coordinator.hpp
+2
-2
libcaf_core/src/get_process_id.cpp
libcaf_core/src/get_process_id.cpp
+1
-1
libcaf_io/src/ip_endpoint.cpp
libcaf_io/src/ip_endpoint.cpp
+3
-3
libcaf_openssl/CMakeLists.txt
libcaf_openssl/CMakeLists.txt
+3
-0
No files found.
CMakeLists.txt
View file @
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
)
...
...
examples/broker/protobuf_broker.cpp
View file @
32fb68b0
...
@@ -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
...
...
examples/broker/simple_broker.cpp
View file @
32fb68b0
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
#ifdef WIN32
#ifdef WIN32
# define _WIN32_WINNT 0x0600
# define _WIN32_WINNT 0x0600
# include <
W
insock2.h>
# include <
w
insock2.h>
#else
#else
# include <arpa/inet.h> // htonl
# include <arpa/inet.h> // htonl
#endif
#endif
...
...
libcaf_core/caf/scheduler/profiled_coordinator.hpp
View file @
32fb68b0
...
@@ -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 <
W
indows.h>
#include <
w
indows.h>
#include <
P
sapi.h>
#include <
p
sapi.h>
#else
#else
#include <sys/resource.h>
#include <sys/resource.h>
#endif
#endif
...
...
libcaf_core/src/get_process_id.cpp
View file @
32fb68b0
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
#include "caf/config.hpp"
#include "caf/config.hpp"
#ifdef CAF_WINDOWS
#ifdef CAF_WINDOWS
# include <
W
indows.h>
# include <
w
indows.h>
#else
#else
# include <sys/types.h>
# include <sys/types.h>
# include <unistd.h>
# include <unistd.h>
...
...
libcaf_io/src/ip_endpoint.cpp
View file @
32fb68b0
...
@@ -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:
...
...
libcaf_openssl/CMakeLists.txt
View file @
32fb68b0
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment