From 5849d3a23a18d0664cb04cc084fa120833b69353 Mon Sep 17 00:00:00 2001 From: Lywx Date: Sat, 15 Jun 2024 21:08:25 -0600 Subject: [PATCH] Added option to specify gbi (#619) --- CMakeLists.txt | 2 +- src/CMakeLists.txt | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f1e22bc58..f69789923 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ set(EXCLUDE_MPQ_SUPPORT FALSE CACHE BOOL "Exclude StormLib and MPQ archive suppo if(EXCLUDE_MPQ_SUPPORT) add_compile_definitions(EXCLUDE_MPQ_SUPPORT) endif() -option(USE_F3DEX2 "Use F3DEX_GBI_2" OFF) +option(GBI_UCODE "Specify the GBI ucode version" F3DEX_GBI_2) # =========== Dependencies ============= include(cmake/dependencies/common.cmake) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 543581173..11236830d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -217,9 +217,7 @@ endif() #=================== Compile Options & Defs =================== -if(USE_F3DEX2) - target_compile_definitions(libultraship PRIVATE F3DEX_GBI_2) -endif() +target_compile_definitions(libultraship PRIVATE ${GBI_UCODE}) if (CMAKE_SYSTEM_NAME STREQUAL "Windows") target_compile_definitions(${PROJECT_NAME} PRIVATE