[vlc-commits] contrib:glslang: don't build debug libraries with a 'd' suffix

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Jan 28 15:26:57 2019 +0100| [3e447997a8dfe6b2ebd40aad83b1582716abe31a] | committer: Steve Lhomme

contrib:glslang: don't build debug libraries with a 'd' suffix

libplacebo won't find it

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3e447997a8dfe6b2ebd40aad83b1582716abe31a
---

 contrib/src/glslang/glslang-win32.patch | 11 +++++++++++
 contrib/src/glslang/rules.mak           |  1 +
 2 files changed, 12 insertions(+)

diff --git a/contrib/src/glslang/glslang-win32.patch b/contrib/src/glslang/glslang-win32.patch
new file mode 100644
index 0000000000..54933cc13f
--- /dev/null
+++ b/contrib/src/glslang/glslang-win32.patch
@@ -0,0 +1,11 @@
+--- glslang/CMakeLists.txt.win32	2019-01-28 14:20:18.208266400 +0100
++++ glslang/CMakeLists.txt	2019-01-28 14:19:39.874088600 +0100
+@@ -52,7 +52,7 @@ if(ENABLE_HLSL)
+ endif(ENABLE_HLSL)
+ 
+ if(WIN32)
+-    set(CMAKE_DEBUG_POSTFIX "d")
++    #set(CMAKE_DEBUG_POSTFIX "d")
+     if(MSVC)
+         include(ChooseMSVCCRT.cmake)
+     endif(MSVC)
diff --git a/contrib/src/glslang/rules.mak b/contrib/src/glslang/rules.mak
index f659bd5adb..5b60a5ab1c 100644
--- a/contrib/src/glslang/rules.mak
+++ b/contrib/src/glslang/rules.mak
@@ -20,6 +20,7 @@ glslang: glslang-$(GLSLANG_BASENAME).tar.xz .sum-glslang
 	rm -Rf $@ $@-$(GLSLANG_BASENAME)
 	mkdir -p $@-$(GLSLANG_BASENAME)
 	tar xvJf "$<" --strip-components=1 -C $@-$(GLSLANG_BASENAME)
+	$(APPLY) $(SRC)/glslang/glslang-win32.patch
 	$(MOVE)
 
 .glslang: glslang toolchain.cmake