TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-27 07:03:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

makepanda: Fix compiling for older NDKs with armv7a

Browse Source
This commit is contained in:
rdb 2021-12-08 14:46:42 +01:00
parent 267907d329
commit c7cccd4791
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makepanda/makepanda.py
View File

@ -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':

6
makepanda/makepandacore.py
View File

@ -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")