chore: Update CMake configuration to enable application build

- Changed CMake flags in the CI workflow to enable building the application instead of Z3ED for Windows and Linux configurations.
- Added undefinitions for Windows macros in imgui_test_harness_service.cc and screenshot_utils.cc to prevent conflicts with protobuf generated code.
This commit is contained in:
scawful
2025-10-09 16:32:06 -04:00
parent b135948ba2
commit b3c6fd6e12
3 changed files with 37 additions and 3 deletions

View File

@@ -209,7 +209,7 @@ jobs:
-DCMAKE_TOOLCHAIN_FILE="$vcpkgToolchain" `
-DYAZE_BUILD_TESTS=OFF `
-DYAZE_BUILD_EMU=OFF `
-DYAZE_BUILD_Z3ED=ON 2>&1 | Tee-Object -FilePath cmake_config.log
-DYAZE_BUILD_APP=ON 2>&1 | Tee-Object -FilePath cmake_config.log
if ($LASTEXITCODE -ne 0) {
Write-Host "::error::CMake configuration failed with exit code $LASTEXITCODE"
@@ -231,7 +231,7 @@ jobs:
-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 \
-DYAZE_BUILD_TESTS=OFF \
-DYAZE_BUILD_EMU=OFF \
-DYAZE_BUILD_Z3ED=ON 2>&1 | tee cmake_config.log
-DYAZE_BUILD_APP=ON 2>&1 | tee cmake_config.log
echo "::endgroup::"
- name: "Configure (Linux)"
@@ -245,7 +245,7 @@ jobs:
-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} \
-DYAZE_BUILD_TESTS=OFF \
-DYAZE_BUILD_EMU=OFF \
-DYAZE_BUILD_Z3ED=ON 2>&1 | tee cmake_config.log
-DYAZE_BUILD_APP=ON 2>&1 | tee cmake_config.log
echo "::endgroup::"
- name: "Report Configure Failure"

View File

@@ -4,6 +4,23 @@
#include <SDL.h>
// Undefine Windows macros that conflict with protobuf generated code
// SDL.h includes Windows.h on Windows, which defines these macros
#ifdef _WIN32
#ifdef DWORD
#undef DWORD
#endif
#ifdef ERROR
#undef ERROR
#endif
#ifdef OVERFLOW
#undef OVERFLOW
#endif
#ifdef IGNORE
#undef IGNORE
#endif
#endif // _WIN32
#include <algorithm>
#include <chrono>
#include <deque>

View File

@@ -4,6 +4,23 @@
#include <SDL.h>
// Undefine Windows macros that conflict with protobuf generated code
// SDL.h includes Windows.h on Windows, which defines these macros
#ifdef _WIN32
#ifdef DWORD
#undef DWORD
#endif
#ifdef ERROR
#undef ERROR
#endif
#ifdef OVERFLOW
#undef OVERFLOW
#endif
#ifdef IGNORE
#undef IGNORE
#endif
#endif // _WIN32
#include <filesystem>
#include <string>