2019-01-03 17:09:32 +01:00
|
|
|
---
|
|
|
|
|
CMakeLists.txt | 4 ++--
|
|
|
|
|
src/CMakeLists.txt | 4 ++--
|
|
|
|
|
tools/zipdir/CMakeLists.txt | 4 ++--
|
|
|
|
|
3 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
|
|
|
|
|
|
Index: gzdoom-3.7.1/CMakeLists.txt
|
|
|
|
|
===================================================================
|
|
|
|
|
--- gzdoom-3.7.1.orig/CMakeLists.txt
|
|
|
|
|
+++ gzdoom-3.7.1/CMakeLists.txt
|
2018-08-05 16:16:08 +02:00
|
|
|
@@ -12,6 +12,7 @@ endif()
|
|
|
|
|
|
2018-01-09 12:51:02 +01:00
|
|
|
list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
|
|
|
|
|
include( FindPackageHandleStandardArgs )
|
|
|
|
|
+include(FindPkgConfig)
|
|
|
|
|
|
2018-08-05 16:16:08 +02:00
|
|
|
# Produce a warning if XP support will be missing when building a 32 bit target for MSVC.
|
2018-01-09 12:51:02 +01:00
|
|
|
if( MSVC )
|
2019-01-03 17:09:32 +01:00
|
|
|
@@ -336,7 +337,7 @@ else()
|
2018-01-09 12:51:02 +01:00
|
|
|
set( GME_LIBRARIES gme )
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
-set( LZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lzma/C" )
|
|
|
|
|
+pkg_check_modules(LZMA REQUIRED clzma)
|
|
|
|
|
|
|
|
|
|
if( NOT CMAKE_CROSSCOMPILING )
|
|
|
|
|
if( NOT CROSS_EXPORTS )
|
2019-01-03 17:09:32 +01:00
|
|
|
@@ -354,7 +355,6 @@ install(DIRECTORY docs/
|
|
|
|
|
DESTINATION ${INSTALL_DOCS_PATH}
|
2018-01-09 12:51:02 +01:00
|
|
|
COMPONENT "Documentation")
|
|
|
|
|
|
|
|
|
|
-add_subdirectory( lzma )
|
|
|
|
|
add_subdirectory( tools )
|
|
|
|
|
add_subdirectory( dumb )
|
|
|
|
|
add_subdirectory( gdtoa )
|
2019-01-03 17:09:32 +01:00
|
|
|
Index: gzdoom-3.7.1/src/CMakeLists.txt
|
|
|
|
|
===================================================================
|
|
|
|
|
--- gzdoom-3.7.1.orig/src/CMakeLists.txt
|
|
|
|
|
+++ gzdoom-3.7.1/src/CMakeLists.txt
|
|
|
|
|
@@ -461,7 +461,7 @@ add_custom_target( revision_check ALL
|
2018-01-09 12:51:02 +01:00
|
|
|
|
|
|
|
|
message( STATUS "Fluid synth libs: ${FLUIDSYNTH_LIBRARIES}" )
|
2019-01-03 17:09:32 +01:00
|
|
|
set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${GME_LIBRARIES}" "${ASMJIT_LIBRARIES}" "${CMAKE_DL_LIBS}" )
|
|
|
|
|
-include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" "${ASMJIT_INCLUDE_DIR}" )
|
|
|
|
|
+include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" "${ASMJIT_INCLUDE_DIR}" )
|
2018-01-09 12:51:02 +01:00
|
|
|
|
|
|
|
|
if( SNDFILE_FOUND )
|
|
|
|
|
set( ZDOOM_LIBS ${ZDOOM_LIBS} "${SNDFILE_LIBRARIES}" )
|
2019-01-03 17:09:32 +01:00
|
|
|
@@ -1301,7 +1301,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS"
|
2018-01-09 12:51:02 +01:00
|
|
|
set( ZDOOM_LIBS ${ZDOOM_LIBS} nsl socket)
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
-target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma )
|
|
|
|
|
+target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb ${LZMA_LIBRARIES})
|
|
|
|
|
|
|
|
|
|
include_directories( .
|
|
|
|
|
g_statusbar
|
2019-01-03 17:09:32 +01:00
|
|
|
Index: gzdoom-3.7.1/tools/zipdir/CMakeLists.txt
|
|
|
|
|
===================================================================
|
|
|
|
|
--- gzdoom-3.7.1.orig/tools/zipdir/CMakeLists.txt
|
|
|
|
|
+++ gzdoom-3.7.1/tools/zipdir/CMakeLists.txt
|
2018-01-09 12:51:02 +01: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()
|
