Merge branch 'master' of https://github.com/nurupo/InsertProjectNameHere into nurupo-master

Conflicts:
	testing/CMakeLists.txt

1 files changed, 5 insertions, 4 deletions

diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
index 988efe42..af771085 100644
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -9,10 +9,11 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testclient.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testserver.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Messenger_test.cmake)
 if(WIN32)
-        include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox_win32.cmake)
+    include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox_win32.cmake)
 endif()
-if(NOT WIN32)
-        include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox.cmake)
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/toxic.cmake)
 
+if(NOT WIN32)
+    include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox.cmake)
+    include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/toxic.cmake)
+    add_subdirectory(other)
 endif()