Compiling again

CMakeLists.txt

@@ -57,11 +57,8 @@ add_subdirectory(tools)
 # Include the client or the test tools
 if(TARGET_TYPE STREQUAL test)
   add_subdirectory(test)
-elseif(TARGET_TYPE STREQUAL game)
-  add_subdirectory(client)
 endif()
 
-
 # Set up shared assets
 tool_copy(shader_textured
   ${ASSETS_SOURCE_DIR}/shared/shaders/textured.vert shaders/textured.vert

lib/CMakeLists.txt

@@ -3,7 +3,7 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-add_subdirectory(Unity)
+# add_subdirectory(Unity)
 add_subdirectory(cglm)
 add_subdirectory(glfw)
 add_subdirectory(duktape)

src/CMakeLists.txt

@@ -10,7 +10,6 @@ target_link_libraries(${PROJECT_NAME}
     glad
     cglm
     stb
-    # duktape
 )
 
 target_include_directories(${PROJECT_NAME}
@@ -38,5 +37,8 @@ add_subdirectory(scene)
 add_subdirectory(util)
 # add_subdirectory(vn)
 
-# Add Game Sources
+# Add client and game
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/games/${TARGET_GAME})
+if(TARGET_TYPE STREQUAL game)
+  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/games/${TARGET_GAME})
+  add_subdirectory(client)
+endif()

src/client/CMakeLists.txt

@@ -3,5 +3,4 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-
 add_subdirectory(glfwclient)

src/client/glfwclient/CMakeLists.txt

@@ -3,13 +3,6 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-# Definitions
-add_compile_definitions(
-  SETTING_PLATFORM_GLFW=1
-  SETTING_PLATFORM=1
-  SETTING_PLATFORM_USE_GLAD=1
-)
-
 # Libraries
 target_link_libraries(${PROJECT_NAME} 
   PUBLIC
@@ -21,9 +14,3 @@ target_sources(${PROJECT_NAME}
   PRIVATE
     glfwclient.c
 )
-
-# Includes
-target_include_directories(${PROJECT_NAME}
-  PUBLIC
-    ${CMAKE_CURRENT_LIST_DIR}
-)

src/libs.h

@@ -25,7 +25,7 @@
 #if defined(_WIN32) || defined(_WIN64)
   // Windows Fixes
   # define strtok_r strtok_s
-  # define sleep(n) _sleep(n)
+  # define sleep(n) Sleep(n)
   #include <windows.h>