diff options
| author | Rechi <Rechi@users.noreply.github.com> | 2017-05-15 10:30:03 +0200 |
|---|---|---|
| committer | Rechi <Rechi@users.noreply.github.com> | 2017-05-15 10:30:03 +0200 |
| commit | 73ba141a7cc76f0e7cf17412767f0cbc5786a4a3 (patch) | |
| tree | d97dc9c49605161adb70afd5f66f5da9a7b03e4f /tools/depends | |
| parent | 71e187a43629da93cbacc787b08a394b5b8f941a (diff) | |
[depends] ffmpeg: fix build for iOS 64 bit
Diffstat (limited to 'tools/depends')
| -rw-r--r-- | tools/depends/target/ffmpeg/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tools/depends/target/ffmpeg/Makefile | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt index 0a9e9d38ea..3729ba57ee 100644 --- a/tools/depends/target/ffmpeg/CMakeLists.txt +++ b/tools/depends/target/ffmpeg/CMakeLists.txt @@ -48,6 +48,8 @@ elseif(CORE_SYSTEM_NAME STREQUAL android) elseif(CORE_SYSTEM_NAME STREQUAL ios) 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 --disable-decoder=mpeg_xvmc --disable-vda --disable-crystalhd --enable-videotoolbox --target-os=darwin) diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile index 15379aa552..6a47baa857 100644 --- a/tools/depends/target/ffmpeg/Makefile +++ b/tools/depends/target/ffmpeg/Makefile @@ -46,6 +46,8 @@ endif ifeq ($(OS), ios) ifneq ($(CPU), arm64) ffmpg_config += --cpu=cortex-a8 + else + ffmpg_config += --as="$(NATIVEPREFIX)/bin/gas-preprocessor.pl -arch aarch64 -- $(CC)" endif ffmpg_config += --yasmexe=$(NATIVEPREFIX)/bin/yasm ffmpg_config += --disable-decoder=mpeg_xvmc --disable-vda --disable-crystalhd --enable-videotoolbox |