From 78579d293411bcb139660b64972bec3bd9e35dfb Mon Sep 17 00:00:00 2001 From: scawful Date: Fri, 26 Sep 2025 14:46:41 -0400 Subject: [PATCH] Update CMake include directories for improved modularity and organization - Refactored target_include_directories in app.cmake, emu.cmake, and z3ed.cmake to use absolute paths for better clarity and maintainability. - Updated test_manager.cc and test_manager.h to simplify ImGui header inclusion. - Enhanced test CMakeLists.txt to conditionally include directories for the extract_vanilla_values utility, ensuring proper integration with the new structure. --- src/app/app.cmake | 8 ++-- src/app/emu/emu.cmake | 7 +++- src/app/test/test_manager.cc | 2 +- src/app/test/test_manager.h | 2 +- src/cli/z3ed.cmake | 8 ++-- test/CMakeLists.txt | 72 +++++++++++++++++++----------------- test/test_editor.cc | 2 +- 7 files changed, 57 insertions(+), 44 deletions(-) diff --git a/src/app/app.cmake b/src/app/app.cmake index b5284880..473aed51 100644 --- a/src/app/app.cmake +++ b/src/app/app.cmake @@ -57,9 +57,11 @@ endif() target_include_directories( yaze PUBLIC - lib/ - app/ - ${ASAR_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/src/lib/ + ${CMAKE_SOURCE_DIR}/src/app/ + ${CMAKE_SOURCE_DIR}/src/lib/asar/src + ${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar + ${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar-dll-bindings/c ${CMAKE_SOURCE_DIR}/incl/ ${CMAKE_SOURCE_DIR}/src/ ${CMAKE_SOURCE_DIR}/src/lib/imgui_test_engine diff --git a/src/app/emu/emu.cmake b/src/app/emu/emu.cmake index b7e3814c..791a76f6 100644 --- a/src/app/emu/emu.cmake +++ b/src/app/emu/emu.cmake @@ -34,8 +34,11 @@ endif() target_include_directories( yaze_emu PUBLIC - lib/ - app/ + ${CMAKE_SOURCE_DIR}/src/lib/ + ${CMAKE_SOURCE_DIR}/src/app/ + ${CMAKE_SOURCE_DIR}/src/lib/asar/src + ${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar + ${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar-dll-bindings/c ${CMAKE_SOURCE_DIR}/incl/ ${CMAKE_SOURCE_DIR}/src/ ${PNG_INCLUDE_DIRS} diff --git a/src/app/test/test_manager.cc b/src/app/test/test_manager.cc index f6ca8116..410f2653 100644 --- a/src/app/test/test_manager.cc +++ b/src/app/test/test_manager.cc @@ -6,7 +6,7 @@ #include "app/core/platform/file_dialog.h" #include "app/gfx/arena.h" #include "app/gui/icons.h" -#include "imgui/imgui.h" +#include "imgui.h" #include "util/log.h" // Forward declaration to avoid circular dependency diff --git a/src/app/test/test_manager.h b/src/app/test/test_manager.h index fdcd4e85..cf1ea163 100644 --- a/src/app/test/test_manager.h +++ b/src/app/test/test_manager.h @@ -10,7 +10,7 @@ #include "absl/status/status.h" #include "app/rom.h" -#include "imgui/imgui.h" +#include "imgui.h" #include "util/log.h" // Forward declarations diff --git a/src/cli/z3ed.cmake b/src/cli/z3ed.cmake index 251e9fb3..e76b4a9f 100644 --- a/src/cli/z3ed.cmake +++ b/src/cli/z3ed.cmake @@ -33,9 +33,11 @@ add_executable( target_include_directories( z3ed PUBLIC - lib/ - app/ - ${ASAR_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/src/lib/ + ${CMAKE_SOURCE_DIR}/src/app/ + ${CMAKE_SOURCE_DIR}/src/lib/asar/src + ${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar + ${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar-dll-bindings/c ${CMAKE_SOURCE_DIR}/incl/ ${CMAKE_SOURCE_DIR}/src/ ${PNG_INCLUDE_DIRS} diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index fbd7d0b2..583ede15 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -49,50 +49,56 @@ add_executable( ${YAZE_SRC_FILES} ) -# Add vanilla value extraction utility -add_executable( - extract_vanilla_values - zelda3/extract_vanilla_values.cc - ${YAZE_SRC_FILES} -) +# Add vanilla value extraction utility (only for local development with ROM access) +if(NOT YAZE_MINIMAL_BUILD AND YAZE_ENABLE_ROM_TESTS) + add_executable( + extract_vanilla_values + zelda3/extract_vanilla_values.cc + ${YAZE_SRC_FILES} + ) -target_include_directories( - extract_vanilla_values PUBLIC - app/ - lib/ - ${CMAKE_SOURCE_DIR}/incl/ - ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/src/lib/imgui_test_engine - ${ASAR_INCLUDE_DIR} - ${SDL2_INCLUDE_DIR} - ${PNG_INCLUDE_DIRS} - ${PROJECT_BINARY_DIR} -) + target_include_directories( + extract_vanilla_values PUBLIC + ${CMAKE_SOURCE_DIR}/src/app/ + ${CMAKE_SOURCE_DIR}/src/lib/ + ${CMAKE_SOURCE_DIR}/incl/ + ${CMAKE_SOURCE_DIR}/src/ + ${CMAKE_SOURCE_DIR}/src/lib/imgui_test_engine + ${CMAKE_SOURCE_DIR}/src/lib/asar/src + ${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar + ${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar-dll-bindings/c + ${SDL2_INCLUDE_DIR} + ${PNG_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR} + ) -target_link_libraries( - extract_vanilla_values - ${SDL_TARGETS} - asar-static - ${ABSL_TARGETS} - ${PNG_LIBRARIES} - ${OPENGL_LIBRARIES} - ${CMAKE_DL_LIBS} -) + target_link_libraries( + extract_vanilla_values + ${SDL_TARGETS} + asar-static + ${ABSL_TARGETS} + ${PNG_LIBRARIES} + ${OPENGL_LIBRARIES} + ${CMAKE_DL_LIBS} + ) -# Conditionally link yaze_c only when library is built -if(YAZE_BUILD_LIB) - target_link_libraries(extract_vanilla_values yaze_c) + # Conditionally link yaze_c only when library is built + if(YAZE_BUILD_LIB) + target_link_libraries(extract_vanilla_values yaze_c) + endif() endif() target_include_directories( yaze_test PUBLIC - app/ - lib/ + ${CMAKE_SOURCE_DIR}/src/app/ + ${CMAKE_SOURCE_DIR}/src/lib/ ${CMAKE_SOURCE_DIR}/incl/ ${CMAKE_SOURCE_DIR}/src/ ${CMAKE_SOURCE_DIR}/test/ ${CMAKE_SOURCE_DIR}/src/lib/imgui_test_engine - ${ASAR_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/src/lib/asar/src + ${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar + ${CMAKE_SOURCE_DIR}/src/lib/asar/src/asar-dll-bindings/c ${SDL2_INCLUDE_DIR} ${PNG_INCLUDE_DIRS} ${PROJECT_BINARY_DIR} diff --git a/test/test_editor.cc b/test/test_editor.cc index 553c4969..4f0e0bf2 100644 --- a/test/test_editor.cc +++ b/test/test_editor.cc @@ -7,7 +7,7 @@ #include "app/gui/style.h" #include "imgui/backends/imgui_impl_sdl2.h" #include "imgui/backends/imgui_impl_sdlrenderer2.h" -#include "imgui/imgui.h" +#include "imgui.h" #ifdef IMGUI_ENABLE_TEST_ENGINE #include "imgui_test_engine/imgui_te_context.h"