forked from pool/gzdoom
52 lines
2.1 KiB
Diff
52 lines
2.1 KiB
Diff
From: Jan Engelhardt <jengelh@inai.de>
|
|
Date: 2019-04-13 15:02:22.799297208 +0200
|
|
|
|
Use Vulkan system libraries instead of bundled code.
|
|
|
|
---
|
|
CMakeLists.txt | 4 +---
|
|
libraries/glslang/spirv/CMakeLists.txt | 1 +
|
|
src/CMakeLists.txt | 2 +-
|
|
3 files changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
Index: gzdoom-g4.4.0/CMakeLists.txt
|
|
===================================================================
|
|
--- gzdoom-g4.4.0.orig/CMakeLists.txt
|
|
+++ gzdoom-g4.4.0/CMakeLists.txt
|
|
@@ -307,9 +307,7 @@ option(FORCE_INTERNAL_ASMJIT "Use intern
|
|
mark_as_advanced( FORCE_INTERNAL_ASMJIT )
|
|
|
|
if (HAVE_VULKAN)
|
|
- add_subdirectory( libraries/glslang/glslang)
|
|
- add_subdirectory( libraries/glslang/spirv )
|
|
- add_subdirectory( libraries/glslang/OGLCompilersDLL )
|
|
+ include_directories(/usr/include/glslang/Public /usr/include/SPIRV)
|
|
endif()
|
|
|
|
if( ZLIB_FOUND AND NOT FORCE_INTERNAL_ZLIB )
|
|
Index: gzdoom-g4.4.0/libraries/glslang/spirv/CMakeLists.txt
|
|
===================================================================
|
|
--- gzdoom-g4.4.0.orig/libraries/glslang/spirv/CMakeLists.txt
|
|
+++ gzdoom-g4.4.0/libraries/glslang/spirv/CMakeLists.txt
|
|
@@ -50,6 +50,7 @@ set(SPVREMAP_HEADERS
|
|
doc.h)
|
|
|
|
add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})
|
|
+set_property(TARGET SPIRV OUTPUT_NAME libSPIRV-zdoom)
|
|
set_property(TARGET SPIRV PROPERTY FOLDER glslang)
|
|
set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
|
|
target_include_directories(SPIRV PUBLIC
|
|
Index: gzdoom-g4.4.0/src/CMakeLists.txt
|
|
===================================================================
|
|
--- gzdoom-g4.4.0.orig/src/CMakeLists.txt
|
|
+++ gzdoom-g4.4.0/src/CMakeLists.txt
|
|
@@ -435,7 +435,7 @@ add_custom_target( revision_check ALL
|
|
|
|
set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${CMAKE_DL_LIBS}" )
|
|
if (HAVE_VULKAN)
|
|
- set( ZDOOM_LIBS ${ZDOOM_LIBS} "glslang" "SPIRV" "OGLCompiler")
|
|
+ set( ZDOOM_LIBS ${ZDOOM_LIBS} -lglslang -lSPIRV -lOGLCompiler)
|
|
endif()
|
|
include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" )
|
|
|