diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/DemoCodegen.cmake | 8 | ||||
| -rw-r--r-- | cmake/DemoExecutables.cmake | 4 | ||||
| -rw-r--r-- | cmake/Validation.cmake | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/cmake/DemoCodegen.cmake b/cmake/DemoCodegen.cmake index 6c56cbd..272e424 100644 --- a/cmake/DemoCodegen.cmake +++ b/cmake/DemoCodegen.cmake @@ -21,12 +21,8 @@ function(parse_asset_list INPUT_TXT OUT_FILE_LIST) string(REGEX REPLACE "^[^,]+,[^,]+,[ ]*([^,]+).*" "\\1" FILENAME "${LINE}") string(STRIP "${FILENAME}" FILENAME) - # Try workspace-relative path first + # Use workspace-relative path set(FULL_PATH "${INPUT_DIR}/${FILENAME}") - if(NOT EXISTS ${FULL_PATH}) - # Fall back to legacy path for compatibility - set(FULL_PATH "${CMAKE_CURRENT_SOURCE_DIR}/assets/final/${FILENAME}") - endif() if(EXISTS ${FULL_PATH}) list(APPEND ASSET_FILES ${FULL_PATH}) @@ -108,7 +104,7 @@ add_custom_target(generate_tracker_music ALL DEPENDS ${GENERATED_MUSIC_DATA_CC}) # Asset packing pack_assets(assets ${WORKSPACE_ASSETS} GEN_DEMO_H GEN_DEMO_CC generate_demo_assets) -pack_test_assets(test_assets ${CMAKE_CURRENT_SOURCE_DIR}/assets/final/test_assets_list.txt GEN_TEST_H GEN_TEST_CC generate_test_assets) +pack_test_assets(test_assets ${CMAKE_CURRENT_SOURCE_DIR}/workspaces/test/assets.txt GEN_TEST_H GEN_TEST_CC generate_test_assets) # Mark generated files so CMake always checks if they need rebuilding set_source_files_properties(${GEN_DEMO_H} ${GEN_DEMO_CC} PROPERTIES GENERATED TRUE) diff --git a/cmake/DemoExecutables.cmake b/cmake/DemoExecutables.cmake index 4ea3b34..e3337d7 100644 --- a/cmake/DemoExecutables.cmake +++ b/cmake/DemoExecutables.cmake @@ -48,7 +48,7 @@ endif() # ============================================================================= # Timeline generation -set(TEST_DEMO_SEQ_PATH ${CMAKE_CURRENT_SOURCE_DIR}/assets/test_demo.seq) +set(TEST_DEMO_SEQ_PATH ${CMAKE_CURRENT_SOURCE_DIR}/tools/test_demo.seq) set(GENERATED_TEST_DEMO_TIMELINE_CC ${CMAKE_CURRENT_SOURCE_DIR}/src/generated/test_demo_timeline.cc) add_custom_command( OUTPUT ${GENERATED_TEST_DEMO_TIMELINE_CC} @@ -60,7 +60,7 @@ add_custom_command( add_custom_target(generate_test_demo_timeline ALL DEPENDS ${GENERATED_TEST_DEMO_TIMELINE_CC}) # Music generation -set(TEST_DEMO_TRACK_PATH ${CMAKE_CURRENT_SOURCE_DIR}/assets/test_demo.track) +set(TEST_DEMO_TRACK_PATH ${CMAKE_CURRENT_SOURCE_DIR}/tools/test_demo.track) set(GENERATED_TEST_DEMO_MUSIC_CC ${CMAKE_CURRENT_SOURCE_DIR}/src/generated/test_demo_music.cc) add_custom_command( OUTPUT ${GENERATED_TEST_DEMO_MUSIC_CC} diff --git a/cmake/Validation.cmake b/cmake/Validation.cmake index fb5e71d..1152d1a 100644 --- a/cmake/Validation.cmake +++ b/cmake/Validation.cmake @@ -31,7 +31,7 @@ set(VALIDATION_FLAG ${CMAKE_CURRENT_BINARY_DIR}/uniform_validation_complete.flag add_custom_command( OUTPUT ${VALIDATION_FLAG} COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/tools/validate_uniforms.py ${VALIDATION_FLAG} - COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/tools/validate_uniforms.py ${CMAKE_CURRENT_SOURCE_DIR}/assets/final/shaders ${VALIDATION_CPP_FILES} + COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/tools/validate_uniforms.py ${CMAKE_CURRENT_SOURCE_DIR}/workspaces/main/shaders ${VALIDATION_CPP_FILES} DEPENDS validate_uniforms_script ${WGSL_FILES} ${VALIDATION_CPP_FILES} COMMENT "Validating uniform buffer sizes and alignments..." ) |