Refactor CMake configuration for ImGuiTestEngine and feature flags
- Updated the CMake configuration to use target_compile_definitions for ImGuiTestEngine, improving clarity and maintainability. - Introduced IMGUI_TEST_ENGINE_DEFINITIONS to streamline the definition process for targets linking to ImGuiTestEngine. - Modified feature flags in features.h to conditionally enable the native file dialog based on the YAZE_ENABLE_NFD flag, enhancing flexibility in feature management.
This commit is contained in:
@@ -94,7 +94,9 @@ if(YAZE_ENABLE_UI_TESTS)
|
||||
if(TARGET ImGuiTestEngine)
|
||||
target_include_directories(yaze PUBLIC ${CMAKE_SOURCE_DIR}/src/lib/imgui_test_engine)
|
||||
target_link_libraries(yaze PUBLIC ImGuiTestEngine)
|
||||
target_compile_definitions(yaze PRIVATE YAZE_ENABLE_IMGUI_TEST_ENGINE=1)
|
||||
target_compile_definitions(yaze PRIVATE
|
||||
YAZE_ENABLE_IMGUI_TEST_ENGINE=1
|
||||
${IMGUI_TEST_ENGINE_DEFINITIONS})
|
||||
else()
|
||||
target_compile_definitions(yaze PRIVATE YAZE_ENABLE_IMGUI_TEST_ENGINE=0)
|
||||
endif()
|
||||
|
||||
@@ -39,7 +39,11 @@ class FeatureFlags {
|
||||
bool kLogToConsole = false;
|
||||
|
||||
// Use NFD (Native File Dialog) instead of bespoke file dialog implementation.
|
||||
#if defined(YAZE_ENABLE_NFD) && YAZE_ENABLE_NFD
|
||||
bool kUseNativeFileDialog = true;
|
||||
#else
|
||||
bool kUseNativeFileDialog = false;
|
||||
#endif
|
||||
|
||||
// Overworld flags
|
||||
struct Overworld {
|
||||
|
||||
@@ -240,7 +240,7 @@ void ItemLabel(absl::string_view title, ItemLabelFlags flags) {
|
||||
const ImGuiStyle& style = ImGui::GetStyle();
|
||||
float fullWidth = ImGui::GetContentRegionAvail().x;
|
||||
float itemWidth = ImGui::CalcItemWidth() + style.ItemSpacing.x;
|
||||
ImVec2 textSize = ImGui::CalcTextSize(title.begin(), title.end());
|
||||
ImVec2 textSize = ImGui::CalcTextSize(title.data(), title.data() + title.size());
|
||||
ImRect textRect;
|
||||
textRect.Min = ImGui::GetCursorScreenPos();
|
||||
if (flags & ItemLabelFlag::Right) textRect.Min.x = textRect.Min.x + itemWidth;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include <cmath>
|
||||
#include <cstring>
|
||||
|
||||
#ifdef YAZE_LIB_PNG
|
||||
#if YAZE_LIB_PNG == 1
|
||||
#include <zlib.h>
|
||||
#endif
|
||||
|
||||
@@ -16,7 +16,7 @@ namespace util {
|
||||
|
||||
namespace {
|
||||
|
||||
#ifdef YAZE_LIB_PNG
|
||||
#if YAZE_LIB_PNG == 1
|
||||
uint32_t crc32(const std::vector<uint8_t> &data) {
|
||||
uint32_t crc = ::crc32(0L, Z_NULL, 0);
|
||||
return ::crc32(crc, data.data(), data.size());
|
||||
|
||||
Reference in New Issue
Block a user