vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed Nov 3 18:53:33 2010 +0200| [3267797ea727e1ab298545cc6fc33709fef72609] | committer: Rémi Denis-Courmont
Link GME with CXXLD This reverts commit c46366ce7b2f16f1c5e9efb4cd132538c7fd758b. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3267797ea727e1ab298545cc6fc33709fef72609 --- configure.ac | 6 +----- modules/demux/Modules.am | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 1bb335e..e194780 100644 --- a/configure.ac +++ b/configure.ac @@ -2302,11 +2302,7 @@ AC_ARG_ENABLE(gme, [ --enable-gme Game Music Emu support (default auto)]) AS_IF([test "${enable_gme}" != "no"], [ AC_CHECK_HEADER([gme/gme.h], [ - if test "${SYS}" = "mingw32"; then - VLC_ADD_LIBS([gme], [-lgme -lstdc++]) - else - VLC_ADD_LIBS([gme], [-lgme]) - fi + VLC_ADD_LIBS([gme], [-lgme]) VLC_ADD_PLUGIN([gme]) ], [ AS_IF([test "x${enable_gme}" != "x"], [ diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am index 55f0f82..e4950e4 100644 --- a/modules/demux/Modules.am +++ b/modules/demux/Modules.am @@ -29,7 +29,7 @@ SOURCES_tta = tta.c SOURCES_vc1 = vc1.c SOURCES_demux_cdg = cdg.c SOURCES_smf = smf.c -SOURCES_gme = gme.c +SOURCES_gme = gme.c dummy.cpp SOURCES_dirac = dirac.c SOURCES_image = image.c _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
