incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some Cmake fixes

Browse source
This commit is contained in:
NepDisk 2025-05-01 20:03:51 -04:00
parent dd176a9efd
commit bd7ab20efc
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -72,6 +72,7 @@ cmake_dependent_option(
OFF
)
option(SRB2_CONFIG_ENABLE_DISCORDRPC "Enable Discord RPC features" ON)
option(SRB2_CONFIG_STATIC_STDLIB "Link static version of standard library. All dependencies must also be static" ON)
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_ERRORMODE "Compile C code with warnings treated as errors." OFF)

8
src/sdl/CMakeLists.txt
View file

@ -15,12 +15,8 @@ target_sources(SRB2SDL2 PRIVATE
if("${CMAKE_SYSTEM_NAME}" MATCHES Windows)
target_sources(SRB2SDL2 PRIVATE
../win32/win_dbg.c)
if("${CMAKE_C_COMPILER_ID}" MATCHES clang)
target_sources(SRB2SDL2 PRIVATE
../win32/Srb2win.rc)
endif()
../win32/win_dbg.c
../win32/Srb2win.rc)
endif()
if("${CMAKE_SYSTEM_NAME}" MATCHES Darwin)

2
thirdparty/CMakeLists.txt vendored
View file

@ -45,7 +45,7 @@ if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}")
"SDL2MIXER_MP3 ON"
"SDL2MIXER_MP3_DRMP3 ON"
"SDL2MIXER_MIDI ON"
"SDL2MIXER_OPUS OFF"
"SDL2MIXER_OPUS ON"
"SDL2MIXER_VORBIS STB"
"SDL2MIXER_WAVE ON"
)