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

Merge pull request #30963 from akien-mga/2.1-fix-android_stl-no

Browse Source 
Android: Fix support for android_stl=no with NDK r20
This commit is contained in:
Rémi Verschelde 2019-07-30 17:16:28 +02:00 committed by GitHub
commit 59dea32b68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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(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"])
else:
# This is the legacy and minimal 'System STL' with support for basic features like new and delete
env.Append(LINKFLAGS=['-stdlib=libstdc++'])
else:
if mt_link:
env.Append(LINKFLAGS=['-Wl,--threads'])