2021-04-11 11:28:31 +02:00
|
|
|
From: Jan Engelhardt <jengelh@inai.de>
|
|
|
|
Date: 2019-12-18 23:10:30.098185171 +0100
|
|
|
|
|
|
|
|
Use GME system libraries instead of bundled code.
|
|
|
|
|
2022-11-24 00:57:30 +01:00
|
|
|
How GME is released does not matter. The job of a distro is to string
|
|
|
|
together all its GME users with whatever GME version was chosen by
|
|
|
|
the distro. ABI incompatibilites are addressed, else our own stack
|
|
|
|
wouldn't work.
|
|
|
|
|
2020-06-10 19:09:55 +02:00
|
|
|
---
|
2022-11-24 00:57:30 +01:00
|
|
|
thirdparty/CMakeLists.txt | 6 ++++++
|
|
|
|
1 file changed, 6 insertions(+)
|
2020-06-10 19:09:55 +02:00
|
|
|
|
2021-04-11 00:32:37 +02:00
|
|
|
Index: thirdparty/CMakeLists.txt
|
2020-06-10 19:09:55 +02:00
|
|
|
===================================================================
|
2021-04-11 00:32:37 +02:00
|
|
|
--- thirdparty/CMakeLists.txt.orig
|
|
|
|
+++ thirdparty/CMakeLists.txt
|
2022-11-24 00:57:30 +01:00
|
|
|
@@ -25,6 +25,11 @@ endif()
|
|
|
|
#option(FORCE_INTERNAL_GME "Use internal gme (it is highly unlikely this should be turned off)" ON)
|
2021-04-11 00:32:37 +02:00
|
|
|
#mark_as_advanced(FORCE_INTERNAL_GME GME_INCLUDE_DIR GME_LIBRARY)
|
|
|
|
#find_package(GME QUIET)
|
2022-11-24 00:57:30 +01:00
|
|
|
+include(FindPkgConfig)
|
|
|
|
+pkg_check_modules(GME libgme)
|
|
|
|
+message(STATUS "Using system gme library, includes found at ${GME_INCLUDE_DIRS}")
|
|
|
|
+determine_package_config_dependency(ZMUSIC_PACKAGE_DEPENDENCIES TARGET gme MODULE GME)
|
|
|
|
+if(FALSE)
|
|
|
|
#if(GME_FOUND AND NOT FORCE_INTERNAL_GME)
|
|
|
|
# message(STATUS "Using system gme library, includes found at ${GME_INCLUDE_DIRS}")
|
|
|
|
# set_property(TARGET gme PROPERTY IMPORTED_GLOBAL TRUE)
|
|
|
|
@@ -37,6 +42,7 @@ endif()
|
2021-04-11 00:32:37 +02:00
|
|
|
mark_as_advanced(GME_YM2612_EMU)
|
|
|
|
add_subdirectory(game-music-emu)
|
2022-11-24 00:57:30 +01:00
|
|
|
#endif()
|
2021-04-11 00:32:37 +02:00
|
|
|
+endif()
|
2020-06-10 19:09:55 +02:00
|
|
|
|
2021-04-11 00:32:37 +02:00
|
|
|
add_subdirectory(dumb)
|
|
|
|
add_subdirectory(adlmidi)
|