[vlc-devel] commit: modplug: force linking as C++ ( Rémi Denis-Courmont )

git version control git at videolan.org
Sat Jan 9 17:01:12 CET 2010


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jan  9 17:59:50 2010 +0200| [8e1733aee81ca086428429050c69c63063a8a866] | committer: Rémi Denis-Courmont 

modplug: force linking as C++

modplug is a C++ library (including a C API). So we need the C++ linker,
at least when linking statically.

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

 modules/demux/.gitignore |    1 +
 modules/demux/Modules.am |    7 ++++++-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/modules/demux/.gitignore b/modules/demux/.gitignore
index 08a6d72..d3c41a5 100644
--- a/modules/demux/.gitignore
+++ b/modules/demux/.gitignore
@@ -1 +1,2 @@
 Makefile.am
+dummy.cpp
diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am
index 2928cbe..ca4ca22 100644
--- a/modules/demux/Modules.am
+++ b/modules/demux/Modules.am
@@ -12,7 +12,7 @@ SOURCES_nsv = nsv.c
 SOURCES_real = real.c
 SOURCES_ts = ts.c ../mux/mpeg/csa.c
 SOURCES_ps = ps.c ps.h
-SOURCES_mod = mod.c
+SOURCES_mod = mod.c dummy.cpp
 SOURCES_pva = pva.c
 SOURCES_aiff = aiff.c
 SOURCES_mjpeg = mjpeg.c
@@ -59,3 +59,8 @@ libvlc_LTLIBRARIES += \
 	libwav_plugin.la \
 	libxa_plugin.la \
 	$(NULL)
+
+BUILT_SOURCES += dummy.cpp
+
+dummy.cpp:
+	touch dummy.cpp




More information about the vlc-devel mailing list