thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmake: always build libgme, even if SRB2_CONFIG_SYSTEM_LIBRARIES

Browse source
This commit is contained in:
James R 2023-03-30 23:44:26 -07:00
parent 535fc17875
commit 18287e2ed4
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -132,7 +132,12 @@ if("${SRB2_CONFIG_SYSTEM_LIBRARIES}")
find_package(PNG REQUIRED)
find_package(SDL2 REQUIRED)
find_package(CURL REQUIRED)
find_package(GME REQUIRED)
# libgme defaults to "Nuked" YM2612 emulator, which is
# very SLOW. The system library probably uses the
# default so just always build it.
#find_package(GME REQUIRED)
if (SRB2_CONFIG_ENABLE_WEBM_MOVIES)
find_package(VPX REQUIRED)
find_package(Vorbis REQUIRED)

2
thirdparty/CMakeLists.txt vendored
View file

@ -14,9 +14,9 @@ if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}")
include("cpm-zlib.cmake")
include("cpm-png.cmake")
include("cpm-curl.cmake")
include("cpm-libgme.cmake")
endif()
include("cpm-libgme.cmake")
include("cpm-glm.cmake")
include("cpm-rapidjson.cmake")
include("cpm-discordrpc.cmake")

3
thirdparty/cpm-libgme.cmake vendored
View file

@ -11,5 +11,6 @@ CPMAddPackage(
if(libgme_ADDED)
target_compile_features(gme PRIVATE cxx_std_11)
target_link_libraries(gme PRIVATE ZLIB::ZLIB)
# libgme's CMakeLists.txt already links this
#target_link_libraries(gme PRIVATE ZLIB::ZLIB)
endif()