diff options
author | iphydf <iphydf@users.noreply.github.com> | 2018-02-05 23:50:49 +0000 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2018-02-09 20:51:39 +0000 |
commit | 95029f412c173878a066a5d42c16e3f0161fd445 (patch) | |
tree | 52bfe73363a27c223154bd3bb190a05fcdd84aa8 /cmake | |
parent | 6cd4fcdec4e6671e63e8c7cba2ab4c6d594b13fd (diff) |
Build toxcore with libsodium.dll instead of libsodium.lib.
The .lib doesn't have debugging information. The .dll has a .pdb file
next to it.
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/Dependencies.cmake | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake index 66e94da7..72c43b40 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake | |||
@@ -33,7 +33,7 @@ pkg_use_module(SNDFILE sndfile ) | |||
33 | # :: For MSVC Windows builds. | 33 | # :: For MSVC Windows builds. |
34 | # | 34 | # |
35 | # These require specific installation paths of dependencies: | 35 | # These require specific installation paths of dependencies: |
36 | # - libsodium in libsodium/Win32/Release/v140/static | 36 | # - libsodium in libsodium/Win32/Release/v140/dynamic |
37 | # - pthreads in pthreads-win32/Pre-built.2 | 37 | # - pthreads in pthreads-win32/Pre-built.2 |
38 | # | 38 | # |
39 | ############################################################################### | 39 | ############################################################################### |
@@ -44,13 +44,12 @@ if(MSVC) | |||
44 | find_library(LIBSODIUM_LIBRARIES | 44 | find_library(LIBSODIUM_LIBRARIES |
45 | NAMES sodium libsodium | 45 | NAMES sodium libsodium |
46 | PATHS | 46 | PATHS |
47 | "libsodium/Win32/Release/v140/static" | 47 | "libsodium/Win32/Release/v140/dynamic" |
48 | "libsodium/x64/Release/v140/static" | 48 | "libsodium/x64/Release/v140/dynamic" |
49 | ) | 49 | ) |
50 | if(LIBSODIUM_LIBRARIES) | 50 | if(LIBSODIUM_LIBRARIES) |
51 | include_directories("libsodium/include") | 51 | include_directories("libsodium/include") |
52 | set(LIBSODIUM_FOUND TRUE) | 52 | set(LIBSODIUM_FOUND TRUE) |
53 | add_definitions(-DSODIUM_STATIC) | ||
54 | message("libsodium: ${LIBSODIUM_LIBRARIES}") | 53 | message("libsodium: ${LIBSODIUM_LIBRARIES}") |
55 | else() | 54 | else() |
56 | message(FATAL_ERROR "libsodium libraries not found") | 55 | message(FATAL_ERROR "libsodium libraries not found") |