1 files changed, 9 insertions, 18 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 505983f2..c16ce6fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 2.6.0)
 
+#MinGW prints more warnings for -Wall than gcc does, thus causing build to fail
 if(NOT WIN32)
         if(("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang"))
                 message(STATUS "==== ${CMAKE_C_COMPILER_ID} detected - Adding compiler flags ====")
@@ -7,31 +8,21 @@ if(NOT WIN32)
         endif()
 endif()
 
-if(WIN32)
-        include_directories(${CMAKE_HOME_DIRECTORY}/sodium/include/)
-endif()
-
-set(core_sources
-        core/DHT.c
-        core/network.c
-        core/Lossless_UDP.c
-        core/net_crypto.c
-        core/Messenger.c)
-
-add_library(core ${core_sources})
-
 macro(linkCoreLibraries exe_name)
+        add_dependencies(${exe_name} core)
         if(WIN32)
-                target_link_libraries(${exe_name} core
-                        ${CMAKE_SOURCE_DIR}/sodium/lib/libsodium.a
+                include_directories(${CMAKE_HOME_DIRECTORY}/sodium/include/)
+                target_link_libraries(${exe_name} core
+                ${CMAKE_SOURCE_DIR}/sodium/lib/libsodium.a
                         ws2_32)
         else()
-                target_link_libraries(${exe_name} core
+                target_link_libraries(${exe_name} core
                         sodium)
         endif()
 endmacro()
 
 cmake_policy(SET CMP0011 NEW)
 
-ADD_SUBDIRECTORY(testing)
-ADD_SUBDIRECTORY(other)
\ No newline at end of file
+add_subdirectory(core)
+add_subdirectory(testing)
+add_subdirectory(other)
\ No newline at end of file