From 72dbf6b5f3a3ed145d9e0fb6bd8686b005fa0c47 Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Mon, 1 Nov 2021 14:58:30 -0700 Subject: [PATCH] Fixed some dependencies --- CMakeLists.txt | 8 +++++++- tools/file/CMakeLists.txt | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bceeefca..50584f93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ set(CMAKE_C_STANDARD_REQUIRED ON) # Set some global flags add_compile_definitions( _CRT_SECURE_NO_WARNINGS=1 - ASSET_PREFIX="../../../assets/" + ASSET_PREFIX="../assets/" ) # Do initial set up depending on the build target type. @@ -58,6 +58,11 @@ elseif(TARGET_TYPE STREQUAL game) shared/textures/test_texture.png textures/test_texture.png ) + # Locales + tool_copy(locale_en + locale/language/en-US.csv locale/language/en-US.csv + ) + # Poker Game if(TARGET_GAME STREQUAL poker) add_compile_definitions( @@ -92,6 +97,7 @@ elseif(TARGET_TYPE STREQUAL game) vn_lucy vn_julie vn_sammy + locale_en ) endif() diff --git a/tools/file/CMakeLists.txt b/tools/file/CMakeLists.txt index 9123a9f6..3e7cba74 100644 --- a/tools/file/CMakeLists.txt +++ b/tools/file/CMakeLists.txt @@ -5,7 +5,7 @@ function(tool_assets args) add_custom_target(assets - COMMAND tar -C ./assets -cvf test.zip * + COMMAND tar -C ./assets -cvf assets.zip * DEPENDS ${ARGV} COMMENT "Compressing Assets" ) @@ -29,7 +29,7 @@ function(tool_copy target) endforeach() add_custom_target(${target} - DEPENDS ${MY_LIST} - COMMENT "Copying ${FILE_NAME}" + DEPENDS ${LOOP_DEPENDENCIES} + COMMENT "Creating dependency set ${target}" ) endfunction() \ No newline at end of file