vlc | branch: master | Konstantin Pavlov <[email protected]> | Sun Oct 27 06:34:24 2019 +0300| [31d47ca70e4b8c412eab440b2212bdc6aefdea03] | committer: Konstantin Pavlov
contrib: glew: drop debug postfix from the library name With 4d57652c407d4a75e0b36f4e1fbc438def3b5c2e the Cmake BUILD_TYPE is set to Debug when optimizations are disabled, which is then used by glew to determine the resulting library name. This in turn confuses our build of projectM, which uses glew32 as a name to use when linking. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=31d47ca70e4b8c412eab440b2212bdc6aefdea03 --- contrib/src/glew/glew-drop-debug-postfix.patch | 11 +++++++++++ contrib/src/glew/rules.mak | 1 + 2 files changed, 12 insertions(+) diff --git a/contrib/src/glew/glew-drop-debug-postfix.patch b/contrib/src/glew/glew-drop-debug-postfix.patch new file mode 100644 index 0000000000..cb1e8e4063 --- /dev/null +++ b/contrib/src/glew/glew-drop-debug-postfix.patch @@ -0,0 +1,11 @@ +--- glew.pristine/build/cmake/CMakeLists.txt 2017-07-31 14:25:39.000000000 +0300 ++++ glew/build/cmake/CMakeLists.txt 2019-10-27 06:26:55.413590264 +0300 +@@ -13,8 +13,6 @@ + cmake_policy (SET CMP0042 NEW) + endif() + +-set(CMAKE_DEBUG_POSTFIX d) +- + option (BUILD_UTILS "utilities" ON) + option (GLEW_REGAL "Regal mode" OFF) + option (GLEW_OSMESA "OSMesa mode" OFF) diff --git a/contrib/src/glew/rules.mak b/contrib/src/glew/rules.mak index 241bf6647b..7477d149f6 100644 --- a/contrib/src/glew/rules.mak +++ b/contrib/src/glew/rules.mak @@ -13,6 +13,7 @@ $(TARBALLS)/glew-$(GLEW_VERSION).tgz: glew: glew-$(GLEW_VERSION).tgz .sum-glew $(UNPACK) + $(APPLY) $(SRC)/glew/glew-drop-debug-postfix.patch $(MOVE) .glew: glew toolchain.cmake _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
