diff options
| author | Matt Messier <mmessier@grapetv.org> | 2007-05-15 04:39:58 -0400 |
|---|---|---|
| committer | Matt Messier <mmessier@grapetv.org> | 2007-05-15 04:39:58 -0400 |
| commit | bc5a1e1c45310514350a542d58bf6015beddfdfa (patch) | |
| tree | 27cc3064838961567e5c2251226787a4d3eeefac | |
| parent | 64d0bdba1149a78a1fab7efaac26a45ea719230e (diff) | |
| download | xine-lib-bc5a1e1c45310514350a542d58bf6015beddfdfa.tar.gz xine-lib-bc5a1e1c45310514350a542d58bf6015beddfdfa.tar.bz2 | |
Stupid typo fix when not building universal binaries.
Also some tweaks for Darwin.
| -rw-r--r-- | contrib/Makefile.am | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 1ebb7d5d1..6e019ba62 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -67,6 +67,10 @@ if HAVE_MLIB configure_options += --enable-sunmlib endif +if !HOST_OS_DARWIN +FFMPEG_EXTRA_CFLAGS = -fPIC -DPIC +endif + disable_decoders = \ --disable-decoder=bmp --disable-decoder=cavs --disable-decoder=cljr --disable-decoder=dsicinvideo \ --disable-decoder=ffv1 --disable-decoder=ffvhuff --disable-decoder=gif --disable-decoder=mdec \ @@ -92,8 +96,12 @@ else mkdir -p ffmpeg cd ffmpeg; \ $(srcdir)/ffmpeg/configure $(all_configure_options) \ - --extra-cflags="$(VISIBILITY_FLAG) -fPIC -DPIC" \ + --extra-cflags="$(VISIBILITY_FLAG) $(FFMPEG_EXTRA_CFLAGS)"; \ cd .. +if HOST_OS_DARWIN + cat ffmpeg/config.mak | sed -e '/OPTFLAGS=/s/-mdynamic-no-pic//g' > ffmpeg/config.tmp + mv -f ffmpeg/config.tmp ffmpeg/config.mak +endif endif ffmpeg/libavutil/libavutil.a: ffmpeg/config.mak |