summaryrefslogtreecommitdiff
path: root/src/libsputext
diff options
context:
space:
mode:
authorFrantišek Dvořák <valtri@users.sourceforge.net>2004-02-29 17:26:45 +0000
committerFrantišek Dvořák <valtri@users.sourceforge.net>2004-02-29 17:26:45 +0000
commit21272e4f1caa9d0b3fe81f68929e8bbba125a977 (patch)
tree34e6b88093d79653a2bdd60a9a127a18cfda2f1d /src/libsputext
parenta657c3df2f453941b115de0ece3ad8d849d58a6b (diff)
downloadxine-lib-21272e4f1caa9d0b3fe81f68929e8bbba125a977.tar.gz
xine-lib-21272e4f1caa9d0b3fe81f68929e8bbba125a977.tar.bz2
Various compilation fixes and updates:
- xine compilable without iconv (scream if I something broke) - update MSVC port, fixes in avi demux - add iff.h into makefiles - ffmpeg depends on zlib (build was OK only when freetype was installed) - commit a patch for goom CVS patchset: 6192 CVS date: 2004/02/29 17:26:45
Diffstat (limited to 'src/libsputext')
-rw-r--r--src/libsputext/Makefile.am5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/libsputext/Makefile.am b/src/libsputext/Makefile.am
index ba385352e..99fbbd213 100644
--- a/src/libsputext/Makefile.am
+++ b/src/libsputext/Makefile.am
@@ -2,15 +2,12 @@ include $(top_srcdir)/misc/Makefile.common
libdir = $(XINE_PLUGINDIR)
-if HAVE_GICONV
sputext_decoder = xineplug_decode_sputext.la xineplug_dmx_sputext.la
-endif
lib_LTLIBRARIES = $(sputext_decoder)
xineplug_dmx_sputext_la_SOURCES = demux_sputext.c
-## libgiconv is only needed with FreeBSD
-xineplug_dmx_sputext_la_LIBADD = $(XINE_LIB) $(GICONV_BSD_LIBS)
+xineplug_dmx_sputext_la_LIBADD = $(XINE_LIB)
xineplug_dmx_sputext_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_decode_sputext_la_SOURCES = xine_decoder.c