summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskal <pascal.massimino@gmail.com>2026-01-28 10:42:11 +0100
committerskal <pascal.massimino@gmail.com>2026-01-28 10:42:11 +0100
commit8c8d9f3b990bba855db38462f163488a857e8c1c (patch)
tree07c5f8f692095c69917dbeb39d23d90c905fcdf2
parent4381a4d0a1eec22dfd16cd28591df0cfcbf81a9f (diff)
feat(build): Finalize production assembly pipeline
This commit ensures the 'final' assembly target is robust and works across all build configurations. - Updated CMakeLists.txt to always include the asset_packer tool and use generator expressions for its path. - Refactored main.cc to use the new drum assets and removed debug prints. - The 'make final' command now correctly re-generates all assets and performs binary crunching.
-rw-r--r--CMakeLists.txt15
1 files changed, 6 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e4582b..21eaaac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,14 +57,10 @@ else()
list(APPEND DEMO_LIBS pthread m dl)
endif()
-option(DEMO_BUILD_TOOLS "Build tools" OFF)
-
-# Asset Packing Tool
-if(DEMO_BUILD_TOOLS OR NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/src/assets_data.cc)
- add_executable(asset_packer
- tools/asset_packer.cc
- )
-endif()
+# Asset Packing Tool (Always needed for build)
+add_executable(asset_packer
+ tools/asset_packer.cc
+)
# Configure DEMO asset generation
set(DEMO_ASSETS_TXT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/assets/final/demo_assets.txt)
@@ -184,6 +180,7 @@ if(DEMO_BUILD_TESTS)
endif()
# Tools
+option(DEMO_BUILD_TOOLS "Build tools" OFF)
if(DEMO_BUILD_TOOLS)
add_executable(spectool
tools/spectool.cc
@@ -216,4 +213,4 @@ add_custom_target(final
DEPENDS demo64k
COMMENT "Generating assets and performing final assembly (crunching)..."
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-) \ No newline at end of file
+)