mirror of
https://github.com/HarbourMasters/Shipwright
synced 2026-08-12 12:18:32 -04:00
Move the asset tools under soh/assets
soh-torch and soh-o2r-packer both exist to turn assets into archives, so they sit better beside the assets they read than at the repo root. Nothing tangled: both targets are declared in the root CMakeLists with explicit paths rather than add_subdirectory, and soh/CMakeLists.txt globs only include/, soh/ and src/, so sources under assets/ aren't swept into the soh target.
This commit is contained in:
+3
-3
@@ -240,15 +240,15 @@ endif()
|
||||
# Build-time ROM extraction. soh links torch as a static library, which compiles out torch's
|
||||
# own CLI, so this supplies an entry point around the same code the game runs.
|
||||
add_executable(soh-torch
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/tools/torch-cli/main.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/tools/torch-cli/main.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/soh/soh/Extractor/TorchExtract.cpp
|
||||
)
|
||||
target_include_directories(soh-torch PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/soh/soh/Extractor)
|
||||
target_link_libraries(soh-torch PRIVATE torch)
|
||||
|
||||
add_executable(soh-o2r-packer
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/tools/soh-o2r-packer/main.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/tools/soh-o2r-packer/PngTexture.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/tools/soh-o2r-packer/main.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/tools/soh-o2r-packer/PngTexture.cpp
|
||||
)
|
||||
target_link_libraries(soh-o2r-packer PRIVATE torch)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user