File gzdoom-vulkan.patch of Package gzdoom

Overview Repositories Revisions Requests Users Attributes Meta

File gzdoom-vulkan.patch of Package gzdoom (Revision 6e4c5767b2dd0d0e74ecf0202e82277a)

Currently displaying revision 6e4c5767b2dd0d0e74ecf0202e82277a , Show latest

From: Jan Engelhardt <jengelh@inai.de>
Date: 2019-04-13 15:02:22.799297208 +0200

Use Vulkan/glslang/spirv system libraries instead of bundled code.

---
 CMakeLists.txt     |    4 +---
 src/CMakeLists.txt |    2 +-
 2 files changed, 2 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/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}" )

Places

File gzdoom-vulkan.patch of Package gzdoom (Revision 6e4c5767b2dd0d0e74ecf0202e82277a)

Places