diff options
| author | Jonathan Marshall <jmarshall@xbmc.org> | 2014-04-25 15:29:03 +1200 |
|---|---|---|
| committer | Rainer Hochecker <fernetmenta@online.de> | 2014-04-27 18:05:13 +0200 |
| commit | 7c24457be9b2d19586de65a1e3bc0ef21c3bacc2 (patch) | |
| tree | 7e4db4147b3804f60b65d56e741eeca1dd8a03f1 /tools/depends/target/ffmpeg | |
| parent | 4982f25c91c2963a8f05bef86904dc5ab0f5f380 (diff) | |
[osx] specify target-os as 'darwin' for osx/ios, and amend sed to be compatible with BSD
Diffstat (limited to 'tools/depends/target/ffmpeg')
| -rw-r--r-- | tools/depends/target/ffmpeg/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile index 4abc3f0a13..cb6b6be507 100644 --- a/tools/depends/target/ffmpeg/Makefile +++ b/tools/depends/target/ffmpeg/Makefile @@ -37,9 +37,11 @@ endif ifeq ($(OS), ios) ffmpg_config += --cpu=cortex-a8 --yasmexe=$(NATIVEPREFIX)/bin/yasm ffmpg_config += --disable-decoder=mpeg_xvmc --enable-vda --disable-crystalhd + ffmpg_config += --target-os=darwin endif ifeq ($(OS), osx) ffmpg_config += --disable-decoder=mpeg_xvmc --enable-vda --disable-crystalhd + ffmpg_config += --target-os=darwin endif ifeq ($(findstring arm, $(CPU)), arm) ffmpg_config += --enable-pic --disable-armv5te --disable-armv6t2 @@ -59,7 +61,7 @@ $(TARBALLS_LOCATION)/$(ARCHIVE): $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) rm -rf $(PLATFORM); mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - cd $(PLATFORM); sed -i "s%pkg_config_default=pkg-config%export PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig\npkg_config_default=$(NATIVEPREFIX)/bin/pkg-config%" configure + cd $(PLATFORM); sed -i".bak" -e "s%pkg_config_default=pkg-config%export PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig\npkg_config_default=$(NATIVEPREFIX)/bin/pkg-config%" configure cd $(PLATFORM);\ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ ./configure $(ffmpg_config) |