Improved cmake

1 files changed, 7 insertions, 8 deletions

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index c7016a49..eacb772c 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -1,12 +1,6 @@
 cmake_minimum_required(VERSION 2.6.0)
 project(toxcore C)
 
-if(WIN32)
-        include_directories(${CMAKE_HOME_DIRECTORY}/sodium/include/)
-else(WIN32)
-        include_directories(${SODIUM_INCLUDE_DIR})
-endif()
-
 set(core_sources
         DHT.c
         network.c
@@ -16,8 +10,13 @@ set(core_sources
         LAN_discovery.c
         Messenger.c)
 
-add_library(toxcore SHARED ${core_sources})
-target_link_libraries(toxcore ${SODIUM_LIBRARY})
+if(SHARED_TOXCORE)
+        add_library(toxcore SHARED ${core_sources})
+else()
+        add_library(toxcore ${core_sources})
+endif()
+
+target_link_libraries(toxcore ${LINK_CRYPTO_LIBRARY})
 
 if(WIN32)
         target_link_libraries(toxcore ws2_32)