[vlc-devel] commit: Fix libmodplug compilation by removing abc, mid and pat files since they (Jean-Baptiste Kempf )

git version control git at videolan.org
Sun Apr 6 08:01:17 CEST 2008


vlc | branch: master | Jean-Baptiste Kempf <jb at altair.videolan.org> | Sun Apr  6 07:59:11 2008 +0200| [a52b66d42253f03343197fde517eef915c16de31]

Fix libmodplug compilation by removing abc, mid and pat files since they
don't compile on Windows.

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

 extras/contrib/src/Makefile                       |    3 +++
 extras/contrib/src/Patches/libmodplug-win32.patch |   12 ++++++++++++
 2 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 494a572..ecb5543 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1399,6 +1399,9 @@ libmodplug-$(MODPLUG_VERSION).tar.gz:
 
 libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz
 	$(EXTRACT_GZ)
+#ifdef HAVE_WIN32
+	patch -p0 < Patches/libmodplug-win32.patch
+#end
 
 .mod: libmodplug
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
diff --git a/extras/contrib/src/Patches/libmodplug-win32.patch b/extras/contrib/src/Patches/libmodplug-win32.patch
new file mode 100644
index 0000000..d5fb2eb
--- /dev/null
+++ b/extras/contrib/src/Patches/libmodplug-win32.patch
@@ -0,0 +1,12 @@
+--- libmodplug-0.8.4/src/Makefile.am	2006-11-02 04:48:13.000000000 +0100
++++ libmodplug/src/Makefile.am	2008-04-06 07:55:35.000000000 +0200
+@@ -32,9 +32,6 @@
+                         load_j2b.cpp       \
+                         load_mt2.cpp       \
+                         load_psm.cpp       \
+-                        load_abc.cpp       \
+-                        load_mid.cpp       \
+-                        load_pat.cpp       \
+                         modplug.cpp
+ 
+ libmodplugincludedir = $(includedir)/libmodplug




More information about the vlc-devel mailing list