diff options
-rwxr-xr-x | CMakeLists.txt | 6 | ||||
-rw-r--r-- | core/CMakeLists.txt | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ed934c01..07098391 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -33,15 +33,15 @@ if(NOT USE_NACL) | |||
33 | endif() | 33 | endif() |
34 | 34 | ||
35 | macro(linkCoreLibraries exe_name) | 35 | macro(linkCoreLibraries exe_name) |
36 | add_dependencies(${exe_name} core) | 36 | add_dependencies(${exe_name} toxcore) |
37 | if(WIN32) | 37 | if(WIN32) |
38 | include_directories(${CMAKE_HOME_DIRECTORY}/sodium/include/) | 38 | include_directories(${CMAKE_HOME_DIRECTORY}/sodium/include/) |
39 | target_link_libraries(${exe_name} core | 39 | target_link_libraries(${exe_name} toxcore |
40 | ${CMAKE_SOURCE_DIR}/sodium/lib/libsodium.a | 40 | ${CMAKE_SOURCE_DIR}/sodium/lib/libsodium.a |
41 | ws2_32) | 41 | ws2_32) |
42 | else() | 42 | else() |
43 | include_directories(${SODIUM_INCLUDE_DIR}) | 43 | include_directories(${SODIUM_INCLUDE_DIR}) |
44 | target_link_libraries(${exe_name} core | 44 | target_link_libraries(${exe_name} toxcore |
45 | ${LINK_CRYPTO_LIBRARY}) | 45 | ${LINK_CRYPTO_LIBRARY}) |
46 | 46 | ||
47 | endif() | 47 | endif() |
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 44ae980c..36acb6cf 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt | |||
@@ -1,5 +1,5 @@ | |||
1 | cmake_minimum_required(VERSION 2.6.0) | 1 | cmake_minimum_required(VERSION 2.6.0) |
2 | project(core C) | 2 | project(toxcore C) |
3 | 3 | ||
4 | if(WIN32) | 4 | if(WIN32) |
5 | include_directories(${CMAKE_HOME_DIRECTORY}/sodium/include/) | 5 | include_directories(${CMAKE_HOME_DIRECTORY}/sodium/include/) |
@@ -16,4 +16,4 @@ set(core_sources | |||
16 | LAN_discovery.c | 16 | LAN_discovery.c |
17 | Messenger.c) | 17 | Messenger.c) |
18 | 18 | ||
19 | add_library(core ${core_sources}) | 19 | add_library(toxcore SHARED ${core_sources}) |