Move SRB2_CONFIG_DEV_BUILD and SRB2_CONFIG_TESTERS to the root directory CMakeLists.txt

Repairs the pre-CMake functionality of TESTERS builds having the format `ringracers_branch-name_TESTERS.exe`
This commit is contained in:
toaster 2023-09-26 23:59:14 +01:00
parent 0b5fd330e6
commit 47fe8bb9b1
2 changed files with 7 additions and 4 deletions

View file

@ -76,6 +76,9 @@ option(SRB2_CONFIG_HWRENDER "Enable hardware render (OpenGL) support" ON)
option(SRB2_CONFIG_STATIC_OPENGL "Enable static linking GL (do not do this)" OFF) option(SRB2_CONFIG_STATIC_OPENGL "Enable static linking GL (do not do this)" OFF)
option(SRB2_CONFIG_ERRORMODE "Compile C code with warnings treated as errors." OFF) option(SRB2_CONFIG_ERRORMODE "Compile C code with warnings treated as errors." OFF)
option(SRB2_CONFIG_DEBUGMODE "Compile with PARANOIA, ZDEBUG, RANGECHECK and PACKETDROP defined." OFF) option(SRB2_CONFIG_DEBUGMODE "Compile with PARANOIA, ZDEBUG, RANGECHECK and PACKETDROP defined." OFF)
option(SRB2_CONFIG_DEV_BUILD "Compile a development build." OFF)
option(SRB2_CONFIG_TESTERS "Compile a build for testers." OFF)
# SRB2_CONFIG_PROFILEMODE is probably superceded by some CMake setting.
option(SRB2_CONFIG_MOBJCONSISTANCY "Compile with MOBJCONSISTANCY defined." OFF) option(SRB2_CONFIG_MOBJCONSISTANCY "Compile with MOBJCONSISTANCY defined." OFF)
option(SRB2_CONFIG_PACKETDROP "Compile with PACKETDROP defined." OFF) option(SRB2_CONFIG_PACKETDROP "Compile with PACKETDROP defined." OFF)
option(SRB2_CONFIG_ZDEBUG "Compile with ZDEBUG defined." OFF) option(SRB2_CONFIG_ZDEBUG "Compile with ZDEBUG defined." OFF)
@ -202,6 +205,10 @@ if("${SRB2_SDL2_EXE_NAME}" STREQUAL "")
if(NOT "${SRB2_GIT_REVISION}" STREQUAL "master") if(NOT "${SRB2_GIT_REVISION}" STREQUAL "master")
list(APPEND EXE_NAME_PARTS ${SRB2_GIT_REVISION}) list(APPEND EXE_NAME_PARTS ${SRB2_GIT_REVISION})
endif() endif()
if (SRB2_CONFIG_TESTERS)
list(APPEND EXE_NAME_PARTS "TESTERS")
endif()
else() else()
list(APPEND EXE_NAME_PARTS ${SRB2_SDL2_EXE_NAME}) list(APPEND EXE_NAME_PARTS ${SRB2_SDL2_EXE_NAME})
endif() endif()

View file

@ -205,10 +205,6 @@ set(SRB2_CONFIG_USEASM OFF CACHE BOOL
"Enable NASM tmap implementation for software mode speedup.") "Enable NASM tmap implementation for software mode speedup.")
set(SRB2_CONFIG_YASM OFF CACHE BOOL set(SRB2_CONFIG_YASM OFF CACHE BOOL
"Use YASM in place of NASM.") "Use YASM in place of NASM.")
set(SRB2_CONFIG_DEV_BUILD OFF CACHE BOOL
"Compile a development build of Dr Robotnik's Ring Racers.")
set(SRB2_CONFIG_TESTERS OFF CACHE BOOL
"Compile a build for testers.")
add_subdirectory(blua) add_subdirectory(blua)