Skip to content
Snippets Groups Projects
Commit 18287e2e authored by James R.'s avatar James R.
Browse files

cmake: always build libgme, even if SRB2_CONFIG_SYSTEM_LIBRARIES

parent 535fc178
No related branches found
No related tags found
No related merge requests found
...@@ -132,7 +132,12 @@ if("${SRB2_CONFIG_SYSTEM_LIBRARIES}") ...@@ -132,7 +132,12 @@ if("${SRB2_CONFIG_SYSTEM_LIBRARIES}")
find_package(PNG REQUIRED) find_package(PNG REQUIRED)
find_package(SDL2 REQUIRED) find_package(SDL2 REQUIRED)
find_package(CURL 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) if (SRB2_CONFIG_ENABLE_WEBM_MOVIES)
find_package(VPX REQUIRED) find_package(VPX REQUIRED)
find_package(Vorbis REQUIRED) find_package(Vorbis REQUIRED)
......
...@@ -14,9 +14,9 @@ if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}") ...@@ -14,9 +14,9 @@ if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}")
include("cpm-zlib.cmake") include("cpm-zlib.cmake")
include("cpm-png.cmake") include("cpm-png.cmake")
include("cpm-curl.cmake") include("cpm-curl.cmake")
include("cpm-libgme.cmake")
endif() endif()
include("cpm-libgme.cmake")
include("cpm-glm.cmake") include("cpm-glm.cmake")
include("cpm-rapidjson.cmake") include("cpm-rapidjson.cmake")
include("cpm-discordrpc.cmake") include("cpm-discordrpc.cmake")
......
...@@ -11,5 +11,6 @@ CPMAddPackage( ...@@ -11,5 +11,6 @@ CPMAddPackage(
if(libgme_ADDED) if(libgme_ADDED)
target_compile_features(gme PRIVATE cxx_std_11) 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() endif()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment