Jan Engelhardt 2019-12-18 22:16:41 +00:00 committed by Git OBS Bridge
parent 89eee319af
commit 027da40e62

View File

@ -1,3 +1,8 @@
From: Jan Engelhardt <jengelh@inai.de>
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()