A bit more code cleanup

CMakeLists.txt

@@ -40,109 +40,38 @@ set(TEMP_DIR "${BUILD_DIR}/temp")
 # Include tools
 add_subdirectory(tools)
 
-# Now change sources depending on the target type
+# Include the client or the test tools
 if(TARGET_TYPE STREQUAL test)
   add_subdirectory(test)
 elseif(TARGET_TYPE STREQUAL game)
-  # Set up shared assets
-
-  # Shaders
-  tool_copy(shader_textured
-    ${ASSETS_SOURCE_DIR}/shared/shaders/textured.vert shaders/textured.vert
-    ${ASSETS_SOURCE_DIR}/shared/shaders/textured.frag shaders/textured.frag
-  )
-  tool_copy(shader_singlerenderlist
-    ${ASSETS_SOURCE_DIR}/shared/shaders/singlerenderlist.vert shaders/singlerenderlist.vert
-    ${ASSETS_SOURCE_DIR}/shared/shaders/singlerenderlist.frag shaders/singlerenderlist.frag
-  )
-
-  # Fonts
-  tool_copy(font_opensans
-    ${ASSETS_SOURCE_DIR}/shared/fonts/opensans/OpenSans-Regular.ttf fonts/opensans/OpenSans-Regular.ttf
-    ${ASSETS_SOURCE_DIR}/shared/fonts/opensans/OpenSans-Bold.ttf fonts/opensans/OpenSans-Bold.ttf
-  )
-
-  # Textures
-  tool_texture(texture_test
-    ${ASSETS_SOURCE_DIR}/shared/textures/test_texture.png textures/test_texture
-  )
-
-  # Locales
-  tool_copy(locale_en
-    ${ASSETS_SOURCE_DIR}/locale/language/en-US.csv locale/language/en-US.csv
-  )
-
-  # Poker Game
-  if(TARGET_GAME STREQUAL poker)
-    add_compile_definitions(
-      GAME_NAME="Penny's Poker"
-      GAME_FILE="poker/game.h"
-      GAME_TYPE=pokergame_t
-      GAME_INIT=pokerGameInit
-      GAME_UPDATE=pokerGameUpdate
-      GAME_DISPOSE=pokerGameDispose
-      GAME_VERSION=1.0
-    )
-    
-    
-    # Characters
-    set(DIR_CHARS "${ASSETS_SOURCE_DIR}/poker/characters")
-    tool_vn_character(vn_penny
-      ${DIR_CHARS}/penny/character.xml poker/characters/penny/sprite
-    )
-    tool_vn_character(vn_lucy
-      ${DIR_CHARS}/lucy/character.xml poker/characters/lucy/sprite
-    )
-    tool_vn_character(vn_julie
-      ${DIR_CHARS}/julie/character.xml poker/characters/julie/sprite
-    )
-    tool_vn_character(vn_sammy
-      ${DIR_CHARS}/sammy/character.xml poker/characters/sammy/sprite
-    )
-    tool_vn_character(vn_jenny
-      ${DIR_CHARS}/jenny/character.xml poker/characters/jenny/sprite
-    )
-
-    # World
-    tool_texture(texture_pub
-      ${ASSETS_SOURCE_DIR}/poker/world/pub/pub_skywall.png poker/world/pub
-    )
-
-    tool_assets(
-      shader_textured
-      shader_singlerenderlist
-
-      font_opensans
-
-      texture_test
-      texture_pub
-    
-      vn_penny
-      vn_lucy
-      vn_julie
-      vn_sammy
-      vn_jenny
-
-      locale_en
-    )
-  elseif(TARGET_GAME STREQUAL sandbox)
-    add_compile_definitions(
-      GAME_NAME="Sandbox"
-      GAME_VERSION=1.0
-    )
-
-    tool_assets(
-      shader_textured
-      font_opensans
-      texture_test
-    )
-  endif()
-
-  # Common Game Dependencies.
-  add_dependencies(${PROJECT_NAME} assets )
   add_subdirectory(client)
 endif()
 
 # Add global sources.
 add_subdirectory(lib)
+
+# Set up shared assets
+tool_copy(shader_textured
+  ${ASSETS_SOURCE_DIR}/shared/shaders/textured.vert shaders/textured.vert
+  ${ASSETS_SOURCE_DIR}/shared/shaders/textured.frag shaders/textured.frag
+)
+tool_copy(shader_singlerenderlist
+  ${ASSETS_SOURCE_DIR}/shared/shaders/singlerenderlist.vert shaders/singlerenderlist.vert
+  ${ASSETS_SOURCE_DIR}/shared/shaders/singlerenderlist.frag shaders/singlerenderlist.frag
+)
+
+tool_copy(font_opensans
+  ${ASSETS_SOURCE_DIR}/shared/fonts/opensans/OpenSans-Regular.ttf fonts/opensans/OpenSans-Regular.ttf
+  ${ASSETS_SOURCE_DIR}/shared/fonts/opensans/OpenSans-Bold.ttf fonts/opensans/OpenSans-Bold.ttf
+)
+
+tool_texture(texture_test
+  ${ASSETS_SOURCE_DIR}/shared/textures/test_texture.png textures/test_texture
+)
+
+tool_copy(locale_en
+  ${ASSETS_SOURCE_DIR}/locale/language/en-US.csv locale/language/en-US.csv
+)
+
+# Add actual game sources
 add_subdirectory(src)