godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: Fix support for android_stl=no with NDK r20 

Fixes #30688.
This commit is contained in:
Rémi Verschelde 2019-07-30 14:58:11 +02:00
parent 0a502efc3a
commit 01e65c4555
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platform/android/detect.py
View File

@ -259,6 +259,9 @@ def configure(env):
env.Append(LINKFLAGS=[env["ANDROID_NDK_ROOT"] +"/sources/cxx-stl/llvm-libc++/libs/"+arch_subpath+"/libandroid_support.a"]) env.Append(LINKFLAGS=[env["ANDROID_NDK_ROOT"] +"/sources/cxx-stl/llvm-libc++/libs/"+arch_subpath+"/libandroid_support.a"])
env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/llvm-libc++/libs/"+arch_subpath+"/"]) env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/llvm-libc++/libs/"+arch_subpath+"/"])
env.Append(LINKFLAGS=[env["ANDROID_NDK_ROOT"] +"/sources/cxx-stl/llvm-libc++/libs/"+arch_subpath+"/libc++_shared.so"]) env.Append(LINKFLAGS=[env["ANDROID_NDK_ROOT"] +"/sources/cxx-stl/llvm-libc++/libs/"+arch_subpath+"/libc++_shared.so"])
else:
# This is the legacy and minimal 'System STL' with support for basic features like new and delete
env.Append(LINKFLAGS=['-stdlib=libstdc++'])
else: else:
if mt_link: if mt_link:
env.Append(LINKFLAGS=['-Wl,--threads']) env.Append(LINKFLAGS=['-Wl,--threads'])