mirror of
https://github.com/TokTok/c-toxcore
synced 2026-10-30 20:22:48 +00:00
Changed CMake options to compile the core shared
It is now compiled under 'toxcore' instead of just 'core' to be able to be installed without conflicts.
This commit is contained in:
1 parent
08fbaf0c53
commit
add9c0b6dc
2 files changed
+5
-5
No files matched your search
+3
-3
@@ -33,15 +33,15 @@ if(NOT USE_NACL)
|
||||
endif()
|
||||
|
||||
macro(linkCoreLibraries exe_name)
|
||||
add_dependencies(${exe_name} core)
|
||||
add_dependencies(${exe_name} toxcore)
|
||||
if(WIN32)
|
||||
include_directories(${CMAKE_HOME_DIRECTORY}/sodium/include/)
|
||||
target_link_libraries(${exe_name} core
|
||||
target_link_libraries(${exe_name} toxcore
|
||||
${CMAKE_SOURCE_DIR}/sodium/lib/libsodium.a
|
||||
ws2_32)
|
||||
else()
|
||||
include_directories(${SODIUM_INCLUDE_DIR})
|
||||
target_link_libraries(${exe_name} core
|
||||
target_link_libraries(${exe_name} toxcore
|
||||
${LINK_CRYPTO_LIBRARY})
|
||||
|
||||
endif()
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
cmake_minimum_required(VERSION 2.6.0)
|
||||
project(core C)
|
||||
project(toxcore C)
|
||||
|
||||
if(WIN32)
|
||||
include_directories(${CMAKE_HOME_DIRECTORY}/sodium/include/)
|
||||
@@ -16,4 +16,4 @@ set(core_sources
|
||||
LAN_discovery.c
|
||||
Messenger.c)
|
||||
|
||||
add_library(core ${core_sources})
|
||||
add_library(toxcore SHARED ${core_sources})
|
||||
Reference in new issue
Block a user