[vlc-commits] contrib:gme: always build a static library on Windows

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Tue Nov 21 15:04:27 2017 +0100| [65c5f31b423ab54a7006980ad50ac3994f9e12e3] | committer: Jean-Baptiste Kempf

contrib:gme: always build a static library on Windows

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

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

diff --git a/contrib/src/gme/gme-static.patch b/contrib/src/gme/gme-static.patch
new file mode 100644
index 0000000000..40d77ad94d
--- /dev/null
+++ b/contrib/src/gme/gme-static.patch
@@ -0,0 +1,11 @@
+--- game-music-emu/gme/CMakeLists.txt	2017-11-21 10:43:46.577551600 +0100
++++ game-music-emu/gme/CMakeLists.txt.static	2017-11-21 10:43:22.791330000 +0100
+@@ -137,7 +137,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DI
+ # On some platforms we may need to change headers or whatnot based on whether
+ # we're building the library or merely using the library. The following is
+ # only defined when building the library to allow us to tell which is which.
+-add_definitions(-DBLARGG_BUILD_DLL)
++#add_definitions(-DBLARGG_BUILD_DLL)
+ 
+ # For the gme_types.h
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
diff --git a/contrib/src/gme/rules.mak b/contrib/src/gme/rules.mak
index de66fe9e6c..5f6e4a0228 100644
--- a/contrib/src/gme/rules.mak
+++ b/contrib/src/gme/rules.mak
@@ -14,6 +14,7 @@ game-music-emu: game-music-emu-$(GME_VERSION).tar.bz2 .sum-gme
 	$(UNPACK)
 	$(APPLY) $(SRC)/gme/gme-quotes.patch
 	$(APPLY) $(SRC)/gme/skip-underrun.patch
+	$(APPLY) $(SRC)/gme/gme-static.patch
 	$(MOVE)
 
 .gme: game-music-emu toolchain.cmake