2019-04-13 15:11:19 +02:00
|
|
|
From: Jan Engelhardt <jengelh@inai.de>
|
|
|
|
|
Date: 2018-01-08 13:48:59+0100
|
|
|
|
|
|
|
|
|
|
Use LZMA system libraries instead of bundled code.
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
CMakeLists.txt | 4 ++--
|
|
|
|
|
src/CMakeLists.txt | 4 ++--
|
|
|
|
|
tools/zipdir/CMakeLists.txt | 4 ++--
|
|
|
|
|
3 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
|
|
2019-12-18 23:09:50 +01:00
|
|
|
Index: gzdoom-g4.2.4/CMakeLists.txt
|
2019-04-13 15:11:19 +02:00
|
|
|
===================================================================
|
2019-12-18 23:09:50 +01:00
|
|
|
--- gzdoom-g4.2.4.orig/CMakeLists.txt
|
|
|
|
|
+++ gzdoom-g4.2.4/CMakeLists.txt
|
2019-04-13 15:11:19 +02:00
|
|
|
@@ -12,6 +12,7 @@ endif()
|
|
|
|
|
|
|
|
|
|
list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
|
|
|
|
|
include( FindPackageHandleStandardArgs )
|
|
|
|
|
+include(FindPkgConfig)
|
|
|
|
|
|
|
|
|
|
# Support cross compiling
|
|
|
|
|
option( FORCE_CROSSCOMPILE "Turn on cross compiling." NO )
|
2019-12-18 23:09:50 +01:00
|
|
|
@@ -403,7 +404,7 @@ else()
|
2019-04-13 15:11:19 +02:00
|
|
|
set( GME_LIBRARIES gme )
|
|
|
|
|
endif()
|
|
|
|
|
|
2019-08-23 15:14:20 +02:00
|
|
|
-set( LZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/lzma/C" )
|
2019-04-13 15:11:19 +02:00
|
|
|
+pkg_check_modules(LZMA REQUIRED clzma)
|
2019-12-18 23:09:50 +01:00
|
|
|
set( ADL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/adlmidi" )
|
|
|
|
|
set( OPN_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/opnmidi" )
|
|
|
|
|
set( TIMIDITYPP_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/timidityplus" )
|
|
|
|
|
@@ -433,7 +434,6 @@ option( DYN_OPENAL "Dynamically load Ope
|
|
|
|
|
option( DYN_SNDFILE "Dynamically load libsndfile" ON )
|
|
|
|
|
option( DYN_MPG123 "Dynamically load libmpg123" ON )
|
2019-04-13 15:11:19 +02:00
|
|
|
|
2019-08-23 15:14:20 +02:00
|
|
|
-add_subdirectory( libraries/lzma )
|
2019-04-13 15:11:19 +02:00
|
|
|
add_subdirectory( tools )
|
2019-08-23 15:14:20 +02:00
|
|
|
add_subdirectory( libraries/dumb )
|
|
|
|
|
add_subdirectory( libraries/gdtoa )
|
2019-12-18 23:09:50 +01:00
|
|
|
Index: gzdoom-g4.2.4/src/CMakeLists.txt
|
2019-04-13 15:11:19 +02:00
|
|
|
===================================================================
|
2019-12-18 23:09:50 +01:00
|
|
|
--- gzdoom-g4.2.4.orig/src/CMakeLists.txt
|
|
|
|
|
+++ gzdoom-g4.2.4/src/CMakeLists.txt
|
|
|
|
|
@@ -436,7 +436,7 @@ set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LI
|
2019-04-13 15:11:19 +02:00
|
|
|
if (HAVE_VULKAN)
|
|
|
|
|
set( ZDOOM_LIBS ${ZDOOM_LIBS} "glslang" "SPIRV" "OGLCompiler")
|
|
|
|
|
endif()
|
2019-12-18 23:09:50 +01:00
|
|
|
-include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" )
|
|
|
|
|
+include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" )
|
2019-04-13 15:11:19 +02:00
|
|
|
|
|
|
|
|
if( ${HAVE_VM_JIT} )
|
|
|
|
|
add_definitions( -DHAVE_VM_JIT )
|
2019-12-18 23:09:50 +01:00
|
|
|
@@ -1211,7 +1211,7 @@ if( UNIX )
|
2019-04-13 15:11:19 +02:00
|
|
|
endif()
|
|
|
|
|
endif()
|
|
|
|
|
|
2019-12-18 23:09:50 +01:00
|
|
|
-target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma adl opn timidity timidityplus wildmidi oplsynth zmusic )
|
|
|
|
|
+target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb ${LZMA_LIBRARIES} adl opn timidity timidityplus wildmidi oplsynth zmusic )
|
2019-04-13 15:11:19 +02:00
|
|
|
|
|
|
|
|
include_directories( .
|
|
|
|
|
g_statusbar
|
2019-12-18 23:09:50 +01:00
|
|
|
Index: gzdoom-g4.2.4/tools/zipdir/CMakeLists.txt
|
2019-04-13 15:11:19 +02:00
|
|
|
===================================================================
|
2019-12-18 23:09:50 +01:00
|
|
|
--- gzdoom-g4.2.4.orig/tools/zipdir/CMakeLists.txt
|
|
|
|
|
+++ gzdoom-g4.2.4/tools/zipdir/CMakeLists.txt
|
2019-04-13 15:11:19 +02:00
|
|
|
@@ -1,9 +1,9 @@
|
|
|
|
|
cmake_minimum_required( VERSION 2.8.7 )
|
|
|
|
|
|
|
|
|
|
if( NOT CMAKE_CROSSCOMPILING )
|
|
|
|
|
- include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" )
|
|
|
|
|
+ include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" )
|
|
|
|
|
add_executable( zipdir
|
|
|
|
|
zipdir.c )
|
|
|
|
|
- target_link_libraries( zipdir ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} lzma )
|
|
|
|
|
+ target_link_libraries( zipdir ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${LZMA_LDFLAGS})
|
|
|
|
|
set( CROSS_EXPORTS ${CROSS_EXPORTS} zipdir PARENT_SCOPE )
|
|
|
|
|
endif()
|
