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 /cmake/scripts | |
| 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 'cmake/scripts')
| -rw-r--r-- | cmake/scripts/android/ArchSetup.cmake | 3 | ||||
| -rw-r--r-- | cmake/scripts/common/PrepareEnv.cmake | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/cmake/scripts/android/ArchSetup.cmake b/cmake/scripts/android/ArchSetup.cmake index f18db6c0d5..1e529de05d 100644 --- a/cmake/scripts/android/ArchSetup.cmake +++ b/cmake/scripts/android/ArchSetup.cmake @@ -27,6 +27,9 @@ else() elseif(CPU STREQUAL i686) set(ARCH i486-linux) set(NEON False) + elseif(CPU STREQUAL x86_64) + set(ARCH x86_64) + set(NEON False) else() message(SEND_ERROR "Unknown CPU: ${CPU}") endif() diff --git a/cmake/scripts/common/PrepareEnv.cmake b/cmake/scripts/common/PrepareEnv.cmake index ed0c11e02a..a547d82cc1 100644 --- a/cmake/scripts/common/PrepareEnv.cmake +++ b/cmake/scripts/common/PrepareEnv.cmake @@ -49,6 +49,8 @@ if(CORE_SYSTEM_NAME STREQUAL android) set(PLATFORM_TAG ${PLATFORM_TAG}-aarch64) elseif (CPU MATCHES "i686") set(PLATFORM_TAG ${PLATFORM_TAG}-i686) + elseif (CPU MATCHES "x86_64") + set(PLATFORM_TAG ${PLATFORM_TAG}-x86_64) else() message(FATAL_ERROR "Unsupported architecture") endif() |