diff options
| author | coco875 <59367621+coco875@users.noreply.github.com> | 2024-08-02 16:45:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-02 08:45:34 -0600 |
| commit | 00067c03f66985ab894221f390cc92894be04945 (patch) | |
| tree | 2be64d94c053e69e821f3534ec17dbff88e2442b /CMakeLists.txt | |
| parent | 2a8362dd1010cad51f5529dc0f5a3dea6e526a4c (diff) | |
fix conflict of GBI_UCODE, update submodule, and fix conflict in header (#33)
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 388679067..34483a55e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,7 +67,7 @@ set(GFX_DEBUG_DISASSEMBLER ON) add_compile_definitions( VERSION_US=1 ENABLE_RUMBLE=1 - F3DEX_GBI=1 + # F3DEX_GBI=1 _LANGUAGE_C _USE_MATH_DEFINES CIMGUI_DEFINE_ENUMS_AND_STRUCTS @@ -358,6 +358,8 @@ endif() option(GBI_UCODE "Use F3DEX_GBI" F3DEX_GBI) +target_compile_definitions(${PROJECT_NAME} PRIVATE F3DEX_GBI=1) + if(MSVC) if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") target_compile_options(${PROJECT_NAME} PRIVATE |