StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Fix for windows dynamic libraries.

Browse Source
This commit is contained in:
iphydf 2016-09-17 13:48:11 +01:00
parent 80cc32a79d
commit 5da85c582d
No known key found for this signature in database
GPG Key ID: 3855DBA2D74403C9
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -91,6 +91,9 @@ set(toxcore_PKGCONFIG_LIBS)
add_module(toxcrypto
toxcore/crypto_core.c)
target_link_modules(toxcrypto ${LIBSODIUM_LIBRARIES})
if(WIN32)
target_link_modules(toxcrypto ws2_32) # for htonl
endif()
# LAYER 2: Basic networking
# -------------------------
@ -204,8 +207,9 @@ target_link_modules(toxencryptsave toxcore)
#
################################################################################
add_test(format_test
${CMAKE_SOURCE_DIR}/other/astyle/format-source "${CMAKE_SOURCE_DIR}")
add_test(
NAME format_test
COMMAND ${CMAKE_SOURCE_DIR}/other/astyle/format-source "${CMAKE_SOURCE_DIR}")
function(auto_test target)
if(CHECK_FOUND)
@ -215,7 +219,7 @@ function(auto_test target)
toxav
toxencryptsave
${CHECK_LIBRARIES})
add_test(${target} auto_${target})
add_test(NAME ${target} COMMAND auto_${target})
endif()
endfunction()

2
auto_tests/tox_test.c
View File

@ -24,10 +24,12 @@
#include <time.h>
#include "../toxcore/tox.h"
#include "../toxcore/util.h"
#include "helpers.h"
#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
#include <windows.h>
#define c_sleep(x) Sleep(1*x)
#else
#include <unistd.h>