From 4f0e1a37c5c74913e1141770a8c159416d8cd22a Mon Sep 17 00:00:00 2001
From: Dominic Masters <dominic@domsplace.com>
Date: Sun, 27 Feb 2022 09:33:55 -0800
Subject: [PATCH] Compiling again

---
 CMakeLists.txt                                   |  3 ---
 lib/CMakeLists.txt                               |  2 +-
 src/CMakeLists.txt                               |  8 +++++---
 {client => src/client}/CMakeLists.txt            |  1 -
 {client => src/client}/glfwclient/CMakeLists.txt | 13 -------------
 {client => src/client}/glfwclient/glfwclient.c   |  0
 {client => src/client}/glfwclient/glfwclient.h   |  0
 src/libs.h                                       |  2 +-
 8 files changed, 7 insertions(+), 22 deletions(-)
 rename {client => src/client}/CMakeLists.txt (99%)
 rename {client => src/client}/glfwclient/CMakeLists.txt (55%)
 rename {client => src/client}/glfwclient/glfwclient.c (100%)
 rename {client => src/client}/glfwclient/glfwclient.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6607c7fe..0f44287b 100644
--- a/CMakeLists.txt
+++ b/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
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 2b4a384b..a55af626 100644
--- a/lib/CMakeLists.txt
+++ b/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)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b319eda8..9ca8686d 100644
--- a/src/CMakeLists.txt
+++ b/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_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/games/${TARGET_GAME})
\ No newline at end of file
+# Add client and game
+if(TARGET_TYPE STREQUAL game)
+  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/games/${TARGET_GAME})
+  add_subdirectory(client)
+endif()
\ No newline at end of file
diff --git a/client/CMakeLists.txt b/src/client/CMakeLists.txt
similarity index 99%
rename from client/CMakeLists.txt
rename to src/client/CMakeLists.txt
index 99294e13..61d6cfd2 100644
--- a/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -3,5 +3,4 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-
 add_subdirectory(glfwclient)
\ No newline at end of file
diff --git a/client/glfwclient/CMakeLists.txt b/src/client/glfwclient/CMakeLists.txt
similarity index 55%
rename from client/glfwclient/CMakeLists.txt
rename to src/client/glfwclient/CMakeLists.txt
index d239b5e7..8a336047 100644
--- a/client/glfwclient/CMakeLists.txt
+++ b/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
@@ -20,10 +13,4 @@ target_link_libraries(${PROJECT_NAME}
 target_sources(${PROJECT_NAME}
   PRIVATE
     glfwclient.c
-)
-
-# Includes
-target_include_directories(${PROJECT_NAME}
-  PUBLIC
-    ${CMAKE_CURRENT_LIST_DIR}
 )
\ No newline at end of file
diff --git a/client/glfwclient/glfwclient.c b/src/client/glfwclient/glfwclient.c
similarity index 100%
rename from client/glfwclient/glfwclient.c
rename to src/client/glfwclient/glfwclient.c
diff --git a/client/glfwclient/glfwclient.h b/src/client/glfwclient/glfwclient.h
similarity index 100%
rename from client/glfwclient/glfwclient.h
rename to src/client/glfwclient/glfwclient.h
diff --git a/src/libs.h b/src/libs.h
index 55d3dd1b..f0e018b4 100644
--- a/src/libs.h
+++ b/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>