From a6c26f4271006fb2ae4e861f1bc2ac333d996b2f Mon Sep 17 00:00:00 2001 From: nillerusr Date: Wed, 17 May 2023 16:06:34 +0000 Subject: [PATCH] replace stlport with gnustl --- scripts/waifulib/xcompile.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/waifulib/xcompile.py b/scripts/waifulib/xcompile.py index 074f01bc..2db9b7f9 100644 --- a/scripts/waifulib/xcompile.py +++ b/scripts/waifulib/xcompile.py @@ -215,7 +215,6 @@ class Android: # TODO: proper STL support return [ #os.path.abspath(os.path.join(self.ndk_home, 'sources', 'cxx-stl', 'system', 'include')), - os.path.abspath(os.path.join(self.ndk_home, 'sources', 'cxx-stl', 'stlport', 'stlport')), os.path.abspath(os.path.join(self.ndk_home, 'sources', 'android', 'support', 'include')) ] @@ -346,8 +345,12 @@ def configure(conf): conf.env.CXXFLAGS += android.cflags(True) conf.env.LINKFLAGS += android.linkflags() conf.env.LDFLAGS += android.ldflags() - conf.env.STLIBPATH += [os.path.abspath(os.path.join(android.ndk_home, 'sources','cxx-stl','stlport','libs',stlarch))] - conf.env.LDFLAGS += ['-lstlport_static'] + conf.env.INCLUDES += [ + os.path.abspath(os.path.join(android.ndk_home, 'sources', 'cxx-stl', 'gnu-libstdc++', '4.9', 'include')), + os.path.abspath(os.path.join(android.ndk_home, 'sources', 'cxx-stl', 'gnu-libstdc++', '4.9', 'libs', stlarch, 'include')) + ] + conf.env.STLIBPATH += [os.path.abspath(os.path.join(android.ndk_home, 'sources','cxx-stl','gnu-libstdc++','4.9','libs',stlarch))] + conf.env.LDFLAGS += ['-lgnustl_static'] conf.env.HAVE_M = True if android.is_hardfp():