From: Jan Engelhardt <jengelh@inai.de>
Date: 2018-01-08 13:48:59+0100

Use system libraries instead of bundled code.

---
 CMakeLists.txt                              |    7 ++-----
 src/CMakeLists.txt                          |    6 +++---
 src/rendering/vulkan/shaders/vk_shader.cpp  |    2 +-
 src/rendering/vulkan/system/vk_builders.cpp |   22 +++++++++++-----------
 tools/zipdir/CMakeLists.txt                 |    4 ++--
 5 files changed, 19 insertions(+), 22 deletions(-)

Index: gzdoom-4.0.0/CMakeLists.txt
===================================================================
--- gzdoom-4.0.0.orig/CMakeLists.txt
+++ gzdoom-4.0.0/CMakeLists.txt
@@ -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 )
@@ -286,9 +287,6 @@ option(FORCE_INTERNAL_ASMJIT "Use intern
 mark_as_advanced( FORCE_INTERNAL_ASMJIT )
 
 if (HAVE_VULKAN)
-	add_subdirectory( glslang/glslang)
-	add_subdirectory( glslang/spirv )
-	add_subdirectory( glslang/OGLCompilersDLL )
 endif()
 
 # Fast math flags, required by some subprojects
@@ -355,7 +353,7 @@ else()
 	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 )
@@ -373,7 +371,6 @@ install(DIRECTORY docs/
 		DESTINATION ${INSTALL_DOCS_PATH}
 		COMPONENT "Documentation")
 
-add_subdirectory( lzma )
 add_subdirectory( tools )
 add_subdirectory( dumb )
 add_subdirectory( gdtoa )
Index: gzdoom-4.0.0/src/CMakeLists.txt
===================================================================
--- gzdoom-4.0.0.orig/src/CMakeLists.txt
+++ gzdoom-4.0.0/src/CMakeLists.txt
@@ -465,9 +465,9 @@ add_custom_target( revision_check ALL
 message( STATUS "Fluid synth libs: ${FLUIDSYNTH_LIBRARIES}" )
 set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${GME_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_DIR}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" )
+include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" )
 
 if( ${HAVE_VM_JIT} )
 	add_definitions( -DHAVE_VM_JIT )
@@ -1370,7 +1370,7 @@ if( UNIX )
 	endif()
 endif()
 
-target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma )
+target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb ${LZMA_LIBRARIES})
 
 include_directories( .
 	g_statusbar
Index: gzdoom-4.0.0/src/rendering/vulkan/shaders/vk_shader.cpp
===================================================================
--- gzdoom-4.0.0.orig/src/rendering/vulkan/shaders/vk_shader.cpp
+++ gzdoom-4.0.0/src/rendering/vulkan/shaders/vk_shader.cpp
@@ -4,7 +4,7 @@
 #include "hwrenderer/utility/hw_shaderpatcher.h"
 #include "w_wad.h"
 #include "doomerrors.h"
-#include <ShaderLang.h>
+#include <glslang/Public/ShaderLang.h>
 
 VkShaderManager::VkShaderManager(VulkanDevice *device) : device(device)
 {
Index: gzdoom-4.0.0/src/rendering/vulkan/system/vk_builders.cpp
===================================================================
--- gzdoom-4.0.0.orig/src/rendering/vulkan/system/vk_builders.cpp
+++ gzdoom-4.0.0/src/rendering/vulkan/system/vk_builders.cpp
@@ -2,8 +2,8 @@
 #include "vk_builders.h"
 #include "doomerrors.h"
 #include "r_data/renderstyle.h"
-#include <ShaderLang.h>
-#include <GlslangToSpv.h>
+#include <glslang/Public/ShaderLang.h>
+#include <SPIRV/GlslangToSpv.h>
 
 static const TBuiltInResource DefaultTBuiltInResource = {
 	/* .MaxLights = */ 32,
@@ -89,15 +89,15 @@ static const TBuiltInResource DefaultTBu
 	/* .MaxCullDistances = */ 8,
 	/* .MaxCombinedClipAndCullDistances = */ 8,
 	/* .MaxSamples = */ 4,
-//	/* .maxMeshOutputVerticesNV = */ 256,
-//	/* .maxMeshOutputPrimitivesNV = */ 512,
-//	/* .maxMeshWorkGroupSizeX_NV = */ 32,
-//	/* .maxMeshWorkGroupSizeY_NV = */ 1,
-//	/* .maxMeshWorkGroupSizeZ_NV = */ 1,
-//	/* .maxTaskWorkGroupSizeX_NV = */ 32,
-//	/* .maxTaskWorkGroupSizeY_NV = */ 1,
-//	/* .maxTaskWorkGroupSizeZ_NV = */ 1,
-//	/* .maxMeshViewCountNV = */ 4,
+	/* .maxMeshOutputVerticesNV = */ 256,
+	/* .maxMeshOutputPrimitivesNV = */ 512,
+	/* .maxMeshWorkGroupSizeX_NV = */ 32,
+	/* .maxMeshWorkGroupSizeY_NV = */ 1,
+	/* .maxMeshWorkGroupSizeZ_NV = */ 1,
+	/* .maxTaskWorkGroupSizeX_NV = */ 32,
+	/* .maxTaskWorkGroupSizeY_NV = */ 1,
+	/* .maxTaskWorkGroupSizeZ_NV = */ 1,
+	/* .maxMeshViewCountNV = */ 4,
 
 	/* .limits = */ {
 		/* .nonInductiveForLoops = */ 1,
Index: gzdoom-4.0.0/tools/zipdir/CMakeLists.txt
===================================================================
--- gzdoom-4.0.0.orig/tools/zipdir/CMakeLists.txt
+++ gzdoom-4.0.0/tools/zipdir/CMakeLists.txt
@@ -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()