1 files changed, 18 insertions, 18 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 07098391..f56cd67a 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,14 +2,18 @@ cmake_minimum_required(VERSION 2.6.0)
 
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
-if(UNIX)
-        find_package(Curses REQUIRED)
-endif()
+option(SHARED_TOXCORE "Build Core as a shared library")
 
-if(NOT WIN32)
+if(WIN32)
+        option(SHARED_LIBSODIUM "Links libsodium as a shared library")
+else()
         option(USE_NACL "Use NaCl library instead of libsodium")
 endif()
 
+if(UNIX)
+        find_package(Curses REQUIRED)
+endif()
+
 if(USE_NACL)
         find_package(NaCl REQUIRED)
 
@@ -17,6 +21,12 @@ if(USE_NACL)
         add_definitions(-DVANILLA_NACL)
 
         set(LINK_CRYPTO_LIBRARY ${NACL_LIBRARIES})
+else()
+        find_package(SODIUM REQUIRED)
+
+        include_directories(${SODIUM_INCLUDE_DIR})
+
+        set(LINK_CRYPTO_LIBRARY ${SODIUM_LIBRARY})
 endif()
 
 #MinGW prints more warnings for -Wall than gcc does, thus causing build to fail
@@ -25,25 +35,15 @@ if(NOT WIN32)
                 message(STATUS "==== ${CMAKE_C_COMPILER_ID} detected - Adding compiler flags ====")
                 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror")
         endif()
-        find_package(SODIUM REQUIRED)
-endif()
-
-if(NOT USE_NACL)
-         set(LINK_CRYPTO_LIBRARY ${SODIUM_LIBRARY})
 endif()
 
 macro(linkCoreLibraries exe_name)
         add_dependencies(${exe_name} toxcore)
-        if(WIN32)
-                include_directories(${CMAKE_HOME_DIRECTORY}/sodium/include/)
-                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} toxcore
-                        ${LINK_CRYPTO_LIBRARY})
+        target_link_libraries(${exe_name} toxcore
+                ${LINK_CRYPTO_LIBRARY})
 
+        if(WIN32)
+                target_link_libraries(${exe_name} ws2_32)
         endif()
 endmacro()