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 #766 from Faless/build/4.x_fix_android_runner 

[SCons] Fix Android builds with modern NDKs.
pull/767/head
Fabio Alessandrelli 2022-06-15 01:50:43 +02:00 committed by GitHub
parent 8dbaf5a7ff b8ae658981
commit 4bebac4372
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SConstruct
View File

@ -419,28 +419,24 @@ elif env["platform"] == "android":
"arm32": { "arm32": {
"march": "armv7-a", "march": "armv7-a",
"target": "armv7a-linux-androideabi", "target": "armv7a-linux-androideabi",
"tool_path": "arm-linux-androideabi",
"compiler_path": "armv7a-linux-androideabi", "compiler_path": "armv7a-linux-androideabi",
"ccflags": ["-mfpu=neon"], "ccflags": ["-mfpu=neon"],
}, },
"arm64": { "arm64": {
"march": "armv8-a", "march": "armv8-a",
"target": "aarch64-linux-android", "target": "aarch64-linux-android",
"tool_path": "aarch64-linux-android",
"compiler_path": "aarch64-linux-android", "compiler_path": "aarch64-linux-android",
"ccflags": [], "ccflags": [],
}, },
"x86_32": { "x86_32": {
"march": "i686", "march": "i686",
"target": "i686-linux-android", "target": "i686-linux-android",
"tool_path": "i686-linux-android",
"compiler_path": "i686-linux-android", "compiler_path": "i686-linux-android",
"ccflags": ["-mstackrealign"], "ccflags": ["-mstackrealign"],
}, },
"x86_64": { "x86_64": {
"march": "x86-64", "march": "x86-64",
"target": "x86_64-linux-android", "target": "x86_64-linux-android",
"tool_path": "x86_64-linux-android",
"compiler_path": "x86_64-linux-android", "compiler_path": "x86_64-linux-android",
"ccflags": [], "ccflags": [],
}, },
@ -450,7 +446,11 @@ elif env["platform"] == "android":
# Setup tools # Setup tools
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/llvm-ar"
env["AS"] = toolchain + "/bin/llvm-as"
env["LD"] = toolchain + "/bin/llvm-ld"
env["STRIP"] = toolchain + "/bin/llvm-strip"
env["RANLIB"] = toolchain + "/bin/llvm-ranlib"
env["SHLIBSUFFIX"] = ".so" env["SHLIBSUFFIX"] = ".so"
env.Append( env.Append(