diff options
| author | Pedro J. Estébanez <RandomShaper@users.noreply.github.com> | 2016-11-13 23:54:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-13 23:54:06 +0100 |
| commit | 5a26459c065558546a708c18ad84830674d5972d (patch) | |
| tree | 9a89542cf3afb7ab42874cb8f3b98da9868ae87d | |
| parent | c93c2a6be8ad0abbfd5cae4831ff2ce2200ae6f6 (diff) | |
Update/fix Android build
Fix wrong path for 32-bit Windows, which fixes #7084
Exclude 32-bit Windows from multi-threaded linking because it's not supported by the NDK
Remove 32-bit Linux as there is no NDK variant for it
| -rw-r--r-- | platform/android/detect.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py index 7f197895f1..d1073e0c7b 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -130,18 +130,17 @@ def configure(env): else: env.extra_suffix = ".armv7" + env.extra_suffix + mt_link = True if (sys.platform.startswith("linux")): - if (platform.machine().endswith('64')): - host_subpath = "linux-x86_64" - else: - host_subpath = "linux-x86" + host_subpath = "linux-x86_64" elif (sys.platform.startswith("darwin")): host_subpath = "darwin-x86_64" elif (sys.platform.startswith('win')): if (platform.machine().endswith('64')): host_subpath = "windows-x86_64" else: - host_subpath = "windows-x86" + mt_link = False + host_subpath = "windows" compiler_path = env["ANDROID_NDK_ROOT"] + \ "/toolchains/llvm/prebuilt/" + host_subpath + "/bin" @@ -205,14 +204,15 @@ def configure(env): env['SHLIBSUFFIX'] = '.so' env['LINKFLAGS'] = ['-shared', '--sysroot=' + - sysroot, '-Wl,--warn-shared-textrel', - '-Wl,--threads'] + sysroot, '-Wl,--warn-shared-textrel'] env.Append(LINKFLAGS=string.split( '-Wl,--fix-cortex-a8')) env.Append(LINKFLAGS=string.split( '-Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now')) env.Append(LINKFLAGS=string.split( '-Wl,-soname,libgodot_android.so -Wl,--gc-sections')) + if mt_link: + env.Append(LINKFLAGS=['-Wl,--threads']) env.Append(LINKFLAGS=target_opts) env.Append(LINKFLAGS=common_opts) |