From cccb09e478c419fb9f0da97b6e99bcf2c98bd751 Mon Sep 17 00:00:00 2001
From: skal <pascal.massimino@gmail.com>
Date: Sat, 31 Jan 2026 21:05:17 +0100
Subject: refactor: move generated asset files to src/generated/

- Updated CMakeLists.txt to generate assets.h and assets_data.cc in src/generated/.
- Updated scripts/gen_assets.sh to reflect the new output location.
- Modified asset_packer.cc to generate correct include paths in assets_data.cc.
- Updated source files (main.cc, asset_manager.cc, test_assets.cc) to include headers from the 'generated/' subdirectory.
- Ensured all targets have correct include paths to find generated headers.
- Removed stale generated files from src/.
---
 CMakeLists.txt | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42c2ec0..ffa29ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,11 +134,11 @@ endif()
 
 # Configure Timeline Generation
 set(DEMO_SEQ_PATH ${CMAKE_CURRENT_SOURCE_DIR}/assets/demo.seq)
-set(GENERATED_TIMELINE_CC ${CMAKE_CURRENT_BINARY_DIR}/src/timeline.cc)
+set(GENERATED_TIMELINE_CC ${CMAKE_CURRENT_BINARY_DIR}/src/generated/timeline.cc)
 
 add_custom_command(
     OUTPUT ${GENERATED_TIMELINE_CC}
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/src
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/src/generated
     COMMAND ${SEQ_COMPILER_CMD} ${DEMO_SEQ_PATH} ${GENERATED_TIMELINE_CC}
     DEPENDS ${SEQ_COMPILER_DEPENDS} ${DEMO_SEQ_PATH}
     COMMENT "Compiling demo sequence..."
@@ -150,12 +150,12 @@ add_custom_target(generate_timeline ALL
 
 # Configure DEMO asset generation
 set(DEMO_ASSETS_TXT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/assets/final/demo_assets.txt)
-set(GENERATED_DEMO_ASSETS_H ${CMAKE_CURRENT_BINARY_DIR}/src/assets.h)
-set(GENERATED_DEMO_ASSETS_DATA_CC ${CMAKE_CURRENT_BINARY_DIR}/src/assets_data.cc)
+set(GENERATED_DEMO_ASSETS_H ${CMAKE_CURRENT_BINARY_DIR}/src/generated/assets.h)
+set(GENERATED_DEMO_ASSETS_DATA_CC ${CMAKE_CURRENT_BINARY_DIR}/src/generated/assets_data.cc)
 
 add_custom_command(
     OUTPUT ${GENERATED_DEMO_ASSETS_H} ${GENERATED_DEMO_ASSETS_DATA_CC}
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/src
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/src/generated
     COMMAND ${ASSET_PACKER_CMD} ${DEMO_ASSETS_TXT_PATH} ${GENERATED_DEMO_ASSETS_H} ${GENERATED_DEMO_ASSETS_DATA_CC}
     DEPENDS ${ASSET_PACKER_DEPENDS} ${DEMO_ASSETS_TXT_PATH}
     COMMENT "Generating demo assets.h and assets_data.cc"
@@ -167,12 +167,12 @@ add_custom_target(generate_demo_assets ALL
 
 # Configure TEST asset generation
 set(TEST_ASSETS_TXT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/assets/final/test_assets_list.txt)
-set(GENERATED_TEST_ASSETS_H ${CMAKE_CURRENT_BINARY_DIR}/src/test_assets.h)
-set(GENERATED_TEST_ASSETS_DATA_CC ${CMAKE_CURRENT_BINARY_DIR}/src/test_assets_data.cc)
+set(GENERATED_TEST_ASSETS_H ${CMAKE_CURRENT_BINARY_DIR}/src/generated/test_assets.h)
+set(GENERATED_TEST_ASSETS_DATA_CC ${CMAKE_CURRENT_BINARY_DIR}/src/generated/test_assets_data.cc)
 
 add_custom_command(
     OUTPUT ${GENERATED_TEST_ASSETS_H} ${GENERATED_TEST_ASSETS_DATA_CC}
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/src
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/src/generated
     COMMAND ${ASSET_PACKER_CMD} ${TEST_ASSETS_TXT_PATH} ${GENERATED_TEST_ASSETS_H} ${GENERATED_TEST_ASSETS_DATA_CC}
     DEPENDS ${ASSET_PACKER_DEPENDS} ${TEST_ASSETS_TXT_PATH}
     COMMENT "Generating test assets.h and assets_data.cc"
@@ -203,7 +203,7 @@ add_executable(demo64k
 
 add_dependencies(demo64k generate_demo_assets generate_timeline)
 target_link_libraries(demo64k PRIVATE ${DEMO_LIBS})
-target_include_directories(demo64k PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
+target_include_directories(demo64k PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src src)
 
 if (DEMO_SIZE_OPT)
     if (MSVC)
@@ -285,7 +285,7 @@ if(DEMO_BUILD_TESTS)
         src/platform.cc
         third_party/glfw3webgpu/glfw3webgpu.c # Link glfw3webgpu source
     )
-        target_include_directories(test_sequence PRIVATE src ${WGPU_ROOT_INCLUDE_DIR} ${WGPU_ROOT_INCLUDE_DIR}/webgpu-headers)
+        target_include_directories(test_sequence PRIVATE src ${WGPU_ROOT_INCLUDE_DIR} ${WGPU_ROOT_INCLUDE_DIR}/webgpu-headers ${CMAKE_CURRENT_BINARY_DIR}/src)
         target_link_libraries(test_sequence PRIVATE ${DEMO_LIBS} ${WGPU_LIBRARY} glfw)
         add_dependencies(test_sequence generate_timeline)
         add_test(NAME SequenceSystemTest COMMAND test_sequence)
@@ -310,6 +310,7 @@ if(DEMO_BUILD_TOOLS OR DEMO_BUILD_TESTS)
         third_party
         ${WGPU_INCLUDE_DIR}
         third_party/glfw3webgpu
+        ${CMAKE_CURRENT_BINARY_DIR}/src
     )
     target_compile_definitions(spectool PRIVATE DEMO_BUILD_TOOLS)
     target_link_libraries(spectool PRIVATE ${DEMO_LIBS})
-- 
cgit v1.2.3