diff options
| author | phunkyfish <phunkyfish@gmail.com> | 2020-02-06 17:48:21 +0000 |
|---|---|---|
| committer | phunkyfish <phunkyfish@gmail.com> | 2020-02-27 12:51:41 +0000 |
| commit | 8810f7ecab3eedc859dd1acebc342ffea4d60b34 (patch) | |
| tree | 0dfa4f6e7d06c0c5f42a74e52974ee31dd68e9ad /tools/depends/target/ffmpeg | |
| parent | cde760b94e57b2e07ab09dcdd25f61ca525266d2 (diff) | |
[ios] set minimum ios version to 11.0 and cleanup dependencies
Diffstat (limited to 'tools/depends/target/ffmpeg')
| -rw-r--r-- | tools/depends/target/ffmpeg/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tools/depends/target/ffmpeg/Makefile | 10 |
2 files changed, 2 insertions, 14 deletions
diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt index 9227dc9427..f3959f9bb7 100644 --- a/tools/depends/target/ffmpeg/CMakeLists.txt +++ b/tools/depends/target/ffmpeg/CMakeLists.txt @@ -66,11 +66,7 @@ elseif(CORE_SYSTEM_NAME STREQUAL android) endif() list(APPEND ffmpeg_conf --target-os=linux --extra-libs=-liconv --disable-linux-perf) elseif(CORE_SYSTEM_NAME STREQUAL darwin_embedded) - if(NOT CPU MATCHES arm64) - list(APPEND ffmpeg_conf --cpu=cortex-a8) - else() - list(APPEND ffmpeg_conf "--as=${NATIVEPREFIX}/bin/gas-preprocessor.pl -arch aarch64 -- ${CMAKE_C_COMPILER}") - endif() + list(APPEND ffmpeg_conf "--as=${NATIVEPREFIX}/bin/gas-preprocessor.pl -arch aarch64 -- ${CMAKE_C_COMPILER}") list(APPEND ffmpeg_conf --disable-decoder=mpeg_xvmc --disable-crystalhd --enable-videotoolbox --target-os=darwin) elseif(CORE_SYSTEM_NAME STREQUAL osx) diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile index c5f5c2a370..d3ce41fe36 100644 --- a/tools/depends/target/ffmpeg/Makefile +++ b/tools/depends/target/ffmpeg/Makefile @@ -48,12 +48,7 @@ ifeq ($(OS), android) ffmpg_config += --target-os=linux --extra-libs=-liconv --disable-linux-perf endif ifeq ($(OS), darwin_embedded) - ifneq ($(CPU), arm64) - ffmpg_config += --cpu=cortex-a8 - ffmpg_config += --as="$(NATIVEPREFIX)/bin/gas-preprocessor.pl -- $(CC)" - else - ffmpg_config += --as="$(NATIVEPREFIX)/bin/gas-preprocessor.pl -arch aarch64 -- $(CC)" - endif + ffmpg_config += --as="$(NATIVEPREFIX)/bin/gas-preprocessor.pl -arch aarch64 -- $(CC)" ffmpg_config += --yasmexe=$(NATIVEPREFIX)/bin/yasm ffmpg_config += --disable-decoder=mpeg_xvmc --disable-crystalhd --enable-videotoolbox ffmpg_config += --target-os=darwin @@ -85,9 +80,6 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) cd $(PLATFORM);\ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ ./configure $(ffmpg_config) -ifeq ($(OS), darwin_embedded) - cd $(PLATFORM); sed -i -- 's/HAVE_CLOCK_GETTIME 1/HAVE_CLOCK_GETTIME 0/g' config.h -endif .build-$(PLATFORM): $(PLATFORM) $(MAKE) -C $(PLATFORM) |