From 21272e4f1caa9d0b3fe81f68929e8bbba125a977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Sun, 29 Feb 2004 17:26:45 +0000 Subject: 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 --- src/libsputext/Makefile.am | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/libsputext') 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 -- cgit v1.2.3