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:
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user