diff options
| author | Alwin Esch <alwin.esch@web.de> | 2020-02-17 23:05:31 +0100 |
|---|---|---|
| committer | Alwin Esch <alwin.esch@web.de> | 2020-02-17 23:05:31 +0100 |
| commit | fda4184fccfa2df1d46924c250407b6e03e8ab65 (patch) | |
| tree | f7cb3559937175a7144d3bd6b8b1949b56f981ff /tools/depends/target/ffmpeg | |
| parent | 05d5568796f01bfb8f88d2b135c22203629f80f8 (diff) | |
[build][depends] add support for x86_64-linux-android
Previously, only an "i686-linux-android" was used which actually only corresponds to
the 32bit CPU.
In reference to this https://developer.android.com/ndk/guides/other_build_systems at 64bit "x86_64-linux-android" is used.
Diffstat (limited to 'tools/depends/target/ffmpeg')
| -rw-r--r-- | tools/depends/target/ffmpeg/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tools/depends/target/ffmpeg/Makefile | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt index 5ee90c4b79..9227dc9427 100644 --- a/tools/depends/target/ffmpeg/CMakeLists.txt +++ b/tools/depends/target/ffmpeg/CMakeLists.txt @@ -59,6 +59,8 @@ elseif(CORE_SYSTEM_NAME STREQUAL android) list(APPEND ffmpeg_conf --cpu=cortex-a53 --arch=aarch64) elseif(CPU MATCHES arm) list(APPEND ffmpeg_conf --cpu=cortex-a9) + elseif(CPU MATCHES x86_64) + list(APPEND ffmpeg_conf --cpu=x86_64 --enable-pic) else() list(APPEND ffmpeg_conf --cpu=i686 --disable-mmx) endif() diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile index 731109ff24..c5f5c2a370 100644 --- a/tools/depends/target/ffmpeg/Makefile +++ b/tools/depends/target/ffmpeg/Makefile @@ -37,8 +37,12 @@ ifeq ($(OS), android) ifeq ($(findstring arm, $(CPU)), arm) ffmpg_config += --cpu=cortex-a9 else - ffmpg_config += --cpu=i686 --disable-mmx - ffmpg_config += --extra-cflags=-no-integrated-as --extra-cflags=-mno-stackrealign + ifeq ($(CPU), x86_64) + ffmpg_config += --cpu=x86_64 --enable-pic + else + ffmpg_config += --cpu=i686 --disable-mmx + endif + ffmpg_config += --extra-cflags='-no-integrated-as -mno-stackrealign' endif endif ffmpg_config += --target-os=linux --extra-libs=-liconv --disable-linux-perf |