[vlc-commits] Revert "Link GME with CXXLD"

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Oct  8 11:00:52 2017 +0300| [5e48de5cd18b76c4a40b4621104194b84158cd07] | committer: Rémi Denis-Courmont

Revert "Link GME with CXXLD"

This reverts commit 3267797ea727e1ab298545cc6fc33709fef72609.

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

 configure.ac              | 6 +++++-
 modules/demux/Makefile.am | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9057500325..5bb82741a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2046,7 +2046,11 @@ AC_ARG_ENABLE(gme,
     [use Game Music Emu (default auto)])])
 AS_IF([test "${enable_gme}" != "no"], [
   AC_CHECK_HEADER([gme/gme.h], [
-    VLC_ADD_LIBS([gme], [-lgme])
+    if test "${SYS}" = "mingw32"; then
+        VLC_ADD_LIBS([gme], [-lgme -lstdc++])
+    else
+        VLC_ADD_LIBS([gme], [-lgme])
+    fi
     VLC_ADD_PLUGIN([gme])
   ], [
     AS_IF([test "x${enable_gme}" != "x"], [
diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am
index 584ddd479a..f2e2e2aafb 100644
--- a/modules/demux/Makefile.am
+++ b/modules/demux/Makefile.am
@@ -99,7 +99,7 @@ demux_LTLIBRARIES += libdemux_cdg_plugin.la
 libsmf_plugin_la_SOURCES = demux/smf.c
 demux_LTLIBRARIES += libsmf_plugin.la
 
-libgme_plugin_la_SOURCES = demux/gme.c dummy.cpp
+libgme_plugin_la_SOURCES = demux/gme.c
 libgme_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)'
 libgme_plugin_la_LIBADD = $(LIBS_gme)
 EXTRA_LTLIBRARIES += libgme_plugin.la