1 files changed, 15 insertions, 14 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06bde84a..841b756a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,30 +1,31 @@
 cmake_minimum_required(VERSION 2.6.0)
 project(TOX C)
- 
+
+set(exe_name toxMessengerTest)
+
 set(core_sources
         core/DHT.c
         core/network.c
         core/Lossless_UDP.c
         core/net_crypto.c
         core/Messenger.c)
-        
+
 set(test_sources
         testing/Messenger_test.c)
-        
-set(exe_name TOX-app)
-
 
 add_executable(${exe_name}
-        ${core_sources}
-        ${test_sources})
+        ${core_sources}
+        ${test_sources})
 
 if(WIN32)
-        target_link_libraries(${exe_name} ws2_32 libsodium)
-else(WIN32)
-        target_link_libraries(libsodium)
-endif(WIN32)
+        include_directories(${TOX_SOURCE_DIR}/sodium/include/)
+        target_link_libraries(${exe_name} ws2_32 
+                ${CMAKE_SOURCE_DIR}/sodium/lib/libsodium.a)
+else()
+        target_link_libraries(${exe_name} sodium)
+endif()
 
 if(CMAKE_COMPILER_IS_GNUCC)
-        message(STATUS "==== GCC detected - Adding compiler flags")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror")
-endif()
\ No newline at end of file
+        message(STATUS "==== GCC detected - Adding compiler flags ====")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror")
+endif()