From 027da40e62458188e447e5d24eaf4fa6d64baf7ea7523f6dfd96e0d339e1c34c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 18 Dec 2019 22:16:41 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=36 --- gzdoom-system-gme.patch | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gzdoom-system-gme.patch b/gzdoom-system-gme.patch index 8283e69..cbdb722 100644 --- a/gzdoom-system-gme.patch +++ b/gzdoom-system-gme.patch @@ -1,3 +1,8 @@ +From: Jan Engelhardt +Date: 2019-12-18 23:10:30.098185171 +0100 + +Use GME system libraries instead of bundled code. + --- CMakeLists.txt | 13 ++++--------- libraries/zmusic/CMakeLists.txt | 2 +- @@ -35,7 +40,7 @@ Index: gzdoom-g4.2.4/CMakeLists.txt if( GME_FOUND AND NOT FORCE_INTERNAL_GME ) - message( STATUS "Using system gme library, includes found at ${GME_INCLUDE_DIR}" ) -+ message( STATUS "Using system gme library, includes found at ${GME_INCLUDE_DIRS}" ) ++ message( STATUS "Using system gme library, includes found at ${GME_INCLUDEDIR}" ) else() message( STATUS "Using internal gme library" ) # Use MAME as it's balanced emulator: well-accurate, but doesn't eats lot of CPU @@ -43,7 +48,7 @@ Index: gzdoom-g4.2.4/CMakeLists.txt set( GME_YM2612_EMU "MAME" ) add_subdirectory( libraries/game-music-emu ) - set( GME_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/game-music-emu" ) -+ set( GME_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/libraries/game-music-emu" ) ++ set( GME_INCLUDEDIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/game-music-emu" ) set( GME_LIBRARIES gme ) endif()