Sara.Sync
/
godot-cpp
mirror of https://github.com/godotengine/godot-cpp
0
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #547 from piiertho/hotfix/add-android-missing-toolchain-elements

pull/619/head
Rémi Verschelde 2021-09-27 11:42:39 +02:00 committed by GitHub
parent 3de367920f f579039a0a
commit 228014bec8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SConstruct
View File

@ -14,7 +14,7 @@ else:
# Workaround for MinGW. See: # Workaround for MinGW. See:
# http://www.scons.org/wiki/LongCmdLinesOnWin32 # http://www.scons.org/wiki/LongCmdLinesOnWin32
if (os.name=="nt"): if os.name == "nt":
import subprocess import subprocess
def mySubProcess(cmdline,env): def mySubProcess(cmdline,env):
@ -387,8 +387,12 @@ elif env['platform'] == 'android':
env['CC'] = toolchain + "/bin/clang" env['CC'] = toolchain + "/bin/clang"
env['CXX'] = toolchain + "/bin/clang++" env['CXX'] = toolchain + "/bin/clang++"
env['AR'] = toolchain + "/bin/" + arch_info['tool_path'] + "-ar" env['AR'] = toolchain + "/bin/" + arch_info['tool_path'] + "-ar"
env["AS"] = toolchain + "/bin/" + arch_info['tool_path'] + "-as"
env["LD"] = toolchain + "/bin/" + arch_info['tool_path'] + "-ld"
env["STRIP"] = toolchain + "/bin/" + arch_info['tool_path'] + "-strip"
env["RANLIB"] = toolchain + "/bin/" + arch_info['tool_path'] + "-ranlib"
env.Append(CCFLAGS=['--target=' + arch_info['target'] + env['android_api_level'], '-march=' + arch_info['march'], '-fPIC'])#, '-fPIE', '-fno-addrsig', '-Oz']) env.Append(CCFLAGS=['--target=' + arch_info['target'] + env['android_api_level'], '-march=' + arch_info['march'], '-fPIC'])
env.Append(CCFLAGS=arch_info['ccflags']) env.Append(CCFLAGS=arch_info['ccflags'])
if env['target'] == 'debug': if env['target'] == 'debug':