summaryrefslogtreecommitdiff
path: root/src/demuxers
diff options
context:
space:
mode:
authorFrantišek Dvořák <valtri@users.sourceforge.net>2004-08-27 19:33:17 +0000
committerFrantišek Dvořák <valtri@users.sourceforge.net>2004-08-27 19:33:17 +0000
commite46ac635c2c28d80706f02f239bb847c7e48c34b (patch)
treeedfd3169ae1ca48fbf36d7d1c6b61ccdfe50d01b /src/demuxers
parent2d5b782a786e81f3ee364210278747d8d338f065 (diff)
downloadxine-lib-e46ac635c2c28d80706f02f239bb847c7e48c34b.tar.gz
xine-lib-e46ac635c2c28d80706f02f239bb847c7e48c34b.tar.bz2
MINGW32 port. Engine library and most of plugins compiles now.
List of some changes: - replaced some _MSC_VER by more common WIN32 - define INTLDIR, remove -static flag for included intl - shared more common CFLAGS with DEBUG_CFLAGS - use WIN32_CFLAGS for all building - separate some flags into THREAD_CFLAGS_CONFIG, THREAD_CFLAGS_CONFIG and ZLIB_LIB_CONFIG for public xine-config, automatically use internal libs if necessary - don't warn about missing X for mingw and cygwin - libw32dll disabled for WIN32 (making native loader would be interesting, or porting wine code to Windows? :->) - DVB and RTP disabled for WIN32, not ported yet - fix build and fix a warning in cdda - fix build for nosefart and libfaad - implement configure option --disable-freetype - sync libxine.pc and xine-config.in - add -liberty to goom under WIN32 - move original build files from included phread and zlib into archives and replace them by autotools CVS patchset: 6910 CVS date: 2004/08/27 19:33:17
Diffstat (limited to 'src/demuxers')
-rw-r--r--src/demuxers/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index 96643b6c9..3fc0accec 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -142,7 +142,7 @@ xineplug_dmx_nsv_la_LIBADD = $(XINE_LIB)
xineplug_dmx_nsv_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_dmx_matroska_la_SOURCES = demux_matroska.c ebml.c
-xineplug_dmx_matroska_la_LIBADD = $(XINE_LIB)
+xineplug_dmx_matroska_la_LIBADD = $(XINE_LIB) $(ZLIB_LIBS)
xineplug_dmx_matroska_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_dmx_iff_la_SOURCES = demux_iff.c