Commit 922b5784 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contribs: compile whole modplug on Win32

It now compiles fine
parent ddb682a6
...@@ -884,6 +884,53 @@ CLEAN_FILE += .faad ...@@ -884,6 +884,53 @@ CLEAN_FILE += .faad
CLEAN_PKG += faad2 CLEAN_PKG += faad2
DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.gz DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.gz
# ***************************************************************************
# libebml
# ***************************************************************************
libebml-$(LIBEBML_VERSION).tar.bz2:
$(WGET) $(LIBEBML_URL)
libebml: libebml-$(LIBEBML_VERSION).tar.bz2
$(EXTRACT_BZ2)
.ebml: libebml
ifdef HAVE_WIN32
(cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC) SHARED=no && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC))
else
(cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
$(RANLIB) $(PREFIX)/lib/libebml.a
endif
touch $@
CLEAN_FILE += .ebml
CLEAN_PKG += libebml
DISTCLEAN_PKG += libebml-$(LIBEBML_VERSION).tar.bz2
# ***************************************************************************
# libmatroska
# ***************************************************************************
libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
$(WGET) $(LIBMATROSKA_URL)
libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
$(EXTRACT_BZ2)
.matroska: libmatroska .ebml
ifdef HAVE_WIN32
(cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC) SHARED=no EBML_DLL=no libmatroska.a && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC))
else
(cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
$(RANLIB) $(PREFIX)/lib/libmatroska.a
endif
touch $@
CLEAN_FILE += .matroska
CLEAN_PKG += libmatroska
DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
# *************************************************************************** # ***************************************************************************
# libvp8 # libvp8
...@@ -946,52 +993,6 @@ CLEAN_FILE += .lame ...@@ -946,52 +993,6 @@ CLEAN_FILE += .lame
CLEAN_PKG += lame CLEAN_PKG += lame
DISTCLEAN_PKG += lame-$(LAME_VERSION).tar.gz DISTCLEAN_PKG += lame-$(LAME_VERSION).tar.gz
# ***************************************************************************
# libebml
# ***************************************************************************
libebml-$(LIBEBML_VERSION).tar.bz2:
$(WGET) $(LIBEBML_URL)
libebml: libebml-$(LIBEBML_VERSION).tar.bz2
$(EXTRACT_BZ2)
.ebml: libebml
ifdef HAVE_WIN32
(cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC) SHARED=no && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC))
else
(cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
$(RANLIB) $(PREFIX)/lib/libebml.a
endif
touch $@
CLEAN_FILE += .ebml
CLEAN_PKG += libebml
DISTCLEAN_PKG += libebml-$(LIBEBML_VERSION).tar.bz2
# ***************************************************************************
# libmatroska
# ***************************************************************************
libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
$(WGET) $(LIBMATROSKA_URL)
libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
$(EXTRACT_BZ2)
.matroska: libmatroska .ebml
ifdef HAVE_WIN32
(cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC) SHARED=no EBML_DLL=no libmatroska.a && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC))
else
(cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
$(RANLIB) $(PREFIX)/lib/libmatroska.a
endif
touch $@
CLEAN_FILE += .matroska
CLEAN_PKG += libmatroska
DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
# *************************************************************************** # ***************************************************************************
# libamrnb # libamrnb
...@@ -1143,15 +1144,6 @@ CLEAN_FILE += .dvdcss ...@@ -1143,15 +1144,6 @@ CLEAN_FILE += .dvdcss
CLEAN_PKG += libdvdcss CLEAN_PKG += libdvdcss
DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2 DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2
# ***************************************************************************
# dummy dvdread to trigger the INSTALL_NAME script
# ***************************************************************************
# .dvdread: .dvdnav
# $(INSTALL_NAME)
# touch $@
#
# CLEAN_FILE += .dvdread
# *************************************************************************** # ***************************************************************************
# libdvdread: We use dvdnav's dvdread # libdvdread: We use dvdnav's dvdread
# *************************************************************************** # ***************************************************************************
...@@ -1420,10 +1412,6 @@ libmodplug-$(MODPLUG_VERSION).tar.gz: ...@@ -1420,10 +1412,6 @@ libmodplug-$(MODPLUG_VERSION).tar.gz:
libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
ifdef HAVE_WIN32
patch -p0 < Patches/libmodplug-win32.patch
(cd $@; autoreconf -ivf )
endif
.mod: libmodplug .mod: libmodplug
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static && make && make install) (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
......
--- 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
diff -ru libmodplug/src/sndfile.cpp libmodplug-new/src/sndfile.cpp
--- libmodplug/src/sndfile.cpp 2006-11-02 04:31:26.000000000 +0000
+++ libmodplug-new/src/sndfile.cpp 2008-04-12 20:56:39.000000000 +0100
@@ -143,8 +143,5 @@
#ifndef MODPLUG_BASIC_SUPPORT
/* Sequencer File Format Support */
- && (!ReadABC(lpStream, dwMemLength))
- && (!ReadMID(lpStream, dwMemLength))
- && (!ReadPAT(lpStream, dwMemLength))
&& (!ReadSTM(lpStream, dwMemLength))
&& (!ReadMed(lpStream, dwMemLength))
&& (!ReadMTM(lpStream, dwMemLength))
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment