diff options
-rw-r--r-- | CMakeLists.txt | 11 | ||||
-rw-r--r-- | cmake/Dependencies.cmake | 2 | ||||
-rw-r--r-- | toxcore/network.c | 11 |
3 files changed, 24 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c3f3d52d..921d0140 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -309,11 +309,22 @@ if(CMAKE_THREAD_LIBS_INIT) | |||
309 | set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} ${CMAKE_THREAD_LIBS_INIT}) | 309 | set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} ${CMAKE_THREAD_LIBS_INIT}) |
310 | endif() | 310 | endif() |
311 | 311 | ||
312 | |||
313 | if(NSL_LIBRARIES) | ||
314 | set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ${NSL_LIBRARIES}) | ||
315 | set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} -lnsl) | ||
316 | endif() | ||
317 | |||
312 | if(RT_LIBRARIES) | 318 | if(RT_LIBRARIES) |
313 | set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ${RT_LIBRARIES}) | 319 | set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ${RT_LIBRARIES}) |
314 | set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} -lrt) | 320 | set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} -lrt) |
315 | endif() | 321 | endif() |
316 | 322 | ||
323 | if(SOCKET_LIBRARIES) | ||
324 | set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ${SOCKET_LIBRARIES}) | ||
325 | set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} -lsocket) | ||
326 | endif() | ||
327 | |||
317 | if(WIN32) | 328 | if(WIN32) |
318 | set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ws2_32 iphlpapi) | 329 | set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ws2_32 iphlpapi) |
319 | set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} -lws2_32 -liphlpapi) | 330 | set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} -lws2_32 -liphlpapi) |
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake index b3e57e50..5970fde7 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake | |||
@@ -8,7 +8,9 @@ include(ModulePackage) | |||
8 | 8 | ||
9 | find_package(Threads REQUIRED) | 9 | find_package(Threads REQUIRED) |
10 | 10 | ||
11 | find_library(NSL_LIBRARIES nsl ) | ||
11 | find_library(RT_LIBRARIES rt ) | 12 | find_library(RT_LIBRARIES rt ) |
13 | find_library(SOCKET_LIBRARIES socket ) | ||
12 | 14 | ||
13 | # For toxcore. | 15 | # For toxcore. |
14 | pkg_use_module(LIBSODIUM libsodium ) | 16 | pkg_use_module(LIBSODIUM libsodium ) |
diff --git a/toxcore/network.c b/toxcore/network.c index 3c262bab..1c1459db 100644 --- a/toxcore/network.c +++ b/toxcore/network.c | |||
@@ -29,6 +29,12 @@ | |||
29 | #define _DARWIN_C_SOURCE | 29 | #define _DARWIN_C_SOURCE |
30 | #endif | 30 | #endif |
31 | 31 | ||
32 | // For Solaris. | ||
33 | #ifdef __sun | ||
34 | #define __EXTENSIONS__ 1 | ||
35 | #endif | ||
36 | |||
37 | // For Linux (and some BSDs). | ||
32 | #ifndef _XOPEN_SOURCE | 38 | #ifndef _XOPEN_SOURCE |
33 | #define _XOPEN_SOURCE 700 | 39 | #define _XOPEN_SOURCE 700 |
34 | #endif | 40 | #endif |
@@ -85,6 +91,11 @@ | |||
85 | #include <sys/types.h> | 91 | #include <sys/types.h> |
86 | #include <unistd.h> | 92 | #include <unistd.h> |
87 | 93 | ||
94 | #ifdef __sun | ||
95 | #include <stropts.h> | ||
96 | #include <sys/filio.h> | ||
97 | #endif | ||
98 | |||
88 | #define TOX_EWOULDBLOCK EWOULDBLOCK | 99 | #define TOX_EWOULDBLOCK EWOULDBLOCK |
89 | 100 | ||
90 | #else | 101 | #else |