From c7cccd47917b9b6b540b5871666c407f9b1d2e7d Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 8 Dec 2021 14:46:42 +0100 Subject: [PATCH] makepanda: Fix compiling for older NDKs with armv7a --- makepanda/makepanda.py | 2 -- makepanda/makepandacore.py | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 41be88dd15..e1e9cdea97 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -1325,10 +1325,8 @@ def CompileCxx(obj,src,opts): cmd += ' -target ' + SDK["ANDROID_TRIPLE"] if arch == 'armv7a': cmd += ' -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16' - cmd += ' -fno-integrated-as' elif arch == 'arm': cmd += ' -march=armv5te -mtune=xscale -msoft-float' - cmd += ' -fno-integrated-as' elif arch == 'mips': cmd += ' -mips32' elif arch == 'mips64': diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index 5d10f736df..ef34421722 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -411,7 +411,7 @@ def SetTarget(target, arch=None): global ANDROID_ABI, ANDROID_TRIPLE if arch == 'armv7a': ANDROID_ABI = 'armeabi-v7a' - ANDROID_TRIPLE = 'arm-linux-androideabi' + ANDROID_TRIPLE = 'armv7a-linux-androideabi' elif arch == 'arm': ANDROID_ABI = 'armeabi' ANDROID_TRIPLE = 'arm-linux-androideabi' @@ -2549,8 +2549,8 @@ def SdkLocateAndroid(): # The Android support library polyfills C++ features not available in the # STL that ships with Android. - support = os.path.join(ndk_root, 'sources', 'android', 'support', 'include') - IncDirectory("ALWAYS", support.replace('\\', '/')) + #support = os.path.join(ndk_root, 'sources', 'android', 'support', 'include') + #IncDirectory("ALWAYS", support.replace('\\', '/')) if api < 21: LibName("ALWAYS", "-landroid_support")