diff options
| author | Pedro J. Estébanez | 2016-11-13 23:54:06 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2016-11-15 08:44:53 +0100 |
| commit | 19ce11b908a2c973a0bd339da83a10e7561df2c7 (patch) | |
| tree | 35d24ec391ed992f1241e6d1447003b8af9ed7d2 /platform/android/detect.py | |
| parent | 28944e95e7ec129408128e0db33a4ad9eaa4c620 (diff) | |
| download | godot-19ce11b908a2c973a0bd339da83a10e7561df2c7.tar.gz godot-19ce11b908a2c973a0bd339da83a10e7561df2c7.tar.zst godot-19ce11b908a2c973a0bd339da83a10e7561df2c7.zip | |
Diffstat (limited to 'platform/android/detect.py')
| -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 7f197895f..d1073e0c7 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) |