]> git.sesse.net Git - vlc/commitdiff
Fix libmodplug compilation by removing abc, mid and pat files since they
authorJean-Baptiste Kempf <jb@altair.videolan.org>
Sun, 6 Apr 2008 05:59:11 +0000 (07:59 +0200)
committerJean-Baptiste Kempf <jb@altair.videolan.org>
Sun, 6 Apr 2008 06:01:35 +0000 (08:01 +0200)
don't compile on Windows.

extras/contrib/src/Makefile
extras/contrib/src/Patches/libmodplug-win32.patch [new file with mode: 0644]

index 494a5720963d73d02b3db5518a69941a7105adb3..ecb55435f2c11067f56f2bf461bfc1e858ad18c7 100644 (file)
@@ -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 (file)
index 0000000..d5fb2eb
--- /dev/null
@@ -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