From 69a1b10dd38c06f34747e7a55d62fdfcec2883cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Mon, 5 Sep 2005 17:02:56 +0000 Subject: *BUGFIX* Build improvements and WIN32 port updates: - add --with-pthread-pefix and --with-zlib-pefix options - prepare for removing internal zlib and pthreads-win32 relics, updated documentation for possible WIN32 developers (only for me? :->) - fixed bug in unimportant part of configure.ac for MinGW due to xine paths - fixed my bug in cdda (but it compiled fine anyway) - fixed unimportant bug in planar Makefile.am - next MSVC update due to external zlib, pthreads and latest changes, removed relic includes - checked distcheck CVS patchset: 7719 CVS date: 2005/09/05 17:02:56 --- src/libffmpeg/Makefile.am | 7 ++++--- src/libffmpeg/libavcodec/Makefile.am | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src/libffmpeg') diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am index 5927fbebc..a5c23ba4e 100644 --- a/src/libffmpeg/Makefile.am +++ b/src/libffmpeg/Makefile.am @@ -1,7 +1,7 @@ include $(top_srcdir)/misc/Makefile.common if HAVE_FFMPEG -FF_CPPFLAGS = $(FFMPEG_CPPFLAGS) +ff_cppflags = $(FFMPEG_CPPFLAGS) link_ffmpeg = $(FFMPEG_LIBS) else link_ffmpeg = \ @@ -20,7 +20,8 @@ libdir = $(XINE_PLUGINDIR) lib_LTLIBRARIES = xineplug_decode_ff.la xineplug_decode_dvaudio.la if HAVE_DXR3 -AM_CPPFLAGS = -I$(top_srcdir)/src/dxr3 $(X_CFLAGS) $(FF_CPPFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/src/dxr3 $(X_CFLAGS) $(ff_cppflags) \ + $(ZLIB_CPPFLAGS) xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c \ xine_encoder.c mpeg_parser.c # The dxr3 uses ffmpegs MPEG encoder by dlopen()ing the ffmpeg plugin and @@ -28,7 +29,7 @@ xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c \ # symbols and cannot use @XINE_PLUGIN_MIN_SYMS@ xineplug_decode_ff_la_LDFLAGS = -avoid-version -module else -AM_CPPFLAGS = $(FF_CPPFLAGS) +AM_CPPFLAGS = $(ff_cppflags) $(ZLIB_CPPFLAGS) xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c \ mpeg_parser.c xineplug_decode_ff_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ diff --git a/src/libffmpeg/libavcodec/Makefile.am b/src/libffmpeg/libavcodec/Makefile.am index 3095cb76c..457c5f275 100644 --- a/src/libffmpeg/libavcodec/Makefile.am +++ b/src/libffmpeg/libavcodec/Makefile.am @@ -10,6 +10,7 @@ EXTRA_DIST = motion_est_template.c imgresample.c \ # otherwise we get unresolved symbols, because some unsatisfied function calls # are not optimized away with debug optimization AM_CFLAGS = $(LIBFFMPEG_CFLAGS) `test "$(CFLAGS)" = "$(DEBUG_CFLAGS)" && echo -DCONFIG_ENCODERS` +AM_CPPFLAGS = $(ZLIB_CPPFLAGS) ASFLAGS = noinst_LTLIBRARIES = libavcodec.la -- cgit v1.2.3