Added F3DEX_GBI_2 macro

KiritoDv · May 23, 2024 · 4d5c80e · 4d5c80e
1 parent cd0f8e1
commit 4d5c80e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/OTRExporter b/OTRExporter
diff --git a/ZAPDTR b/ZAPDTR
diff --git a/libultraship b/libultraship
diff --git a/soh/CMakeLists.txt b/soh/CMakeLists.txt
@@ -407,6 +407,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
 			">"
             "$<$<BOOL:${BUILD_REMOTE_CONTROL}>:ENABLE_REMOTE_CONTROL>"
 			"INCLUDE_GAME_PRINTF;"
+            "F3DEX_GBI_2"
 			"UNICODE;"
 			"_UNICODE"
 			STORMLIB_NO_AUTO_LINK
@@ -425,6 +426,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
 				"NDEBUG;"
 			">"
 			"INCLUDE_GAME_PRINTF;"
+            "F3DEX_GBI_2"
 			"WIN32;"
 			"UNICODE;"
 			"_UNICODE"
@@ -440,6 +442,7 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "CafeOS")
 		"$<$<CONFIG:Release>:"
 			"NDEBUG"
 		">"
+        "F3DEX_GBI_2"
         "SPDLOG_ACTIVE_LEVEL=3;"
 		"SPDLOG_NO_THREAD_ID;"
         "SPDLOG_NO_TLS;"
@@ -453,6 +456,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|AppleClang")
 		"$<$<CONFIG:Release>:"
 			"NDEBUG"
 		">"
+        "F3DEX_GBI_2"
         "$<$<BOOL:${BUILD_REMOTE_CONTROL}>:ENABLE_REMOTE_CONTROL>"
 		"SPDLOG_ACTIVE_LEVEL=0;"
 		"_CONSOLE;"
+11 −9		include/libultraship/libultra/gbi.h
+1 −1		include/libultraship/libultra/gs2dex.h
+33 −0		src/config/Config.cpp
+2 −0		src/config/Config.h
+61 −2		src/config/ConsoleVariable.cpp
+2 −0		src/config/ConsoleVariable.h
+4 −0		src/graphic/Fast3D/Fast3dWindow.cpp
+2 −0		src/graphic/Fast3D/Fast3dWindow.h
+16 −16		src/graphic/Fast3D/f3dex.h
+8 −1		src/graphic/Fast3D/gfx_direct3d11.cpp
+2 −2		src/graphic/Fast3D/gfx_dxgi.cpp
+21 −7		src/graphic/Fast3D/gfx_pc.cpp
+2 −0		src/graphic/Fast3D/gfx_pc.h
+2 −2		src/graphic/Fast3D/gfx_sdl2.cpp
+8 −0		src/public/bridge/consolevariablebridge.cpp
+3 −0		src/public/bridge/consolevariablebridge.h
+4 −4		src/public/bridge/gfxbridge.h
+3 −1		src/resource/factory/DisplayListFactory.cpp