oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-02 16:38:41 +00:00
Code Wiki Activity

Fix armv7 using arm arch while arm uses armv7

Browse source
This commit is contained in:
sapier 2015-01-08 00:11:00 +01:00
parent 2504da28af
commit 04d4a00393
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build/android/Makefile
View file

@ -36,7 +36,7 @@ TARGET_ABI = armeabi
TARGET_LIBDIR = armeabi TARGET_LIBDIR = armeabi
TARGET_TOOLCHAIN = arm-linux-androideabi- TARGET_TOOLCHAIN = arm-linux-androideabi-
TARGET_CFLAGS_ADDON = -mfloat-abi=softfp -mfpu=vfp TARGET_CFLAGS_ADDON = -mfloat-abi=softfp -mfpu=vfp
TARGET_ARCH = armv7 TARGET_ARCH = arm
CROSS_PREFIX = arm-linux-androideabi- CROSS_PREFIX = arm-linux-androideabi-
COMPILER_VERSION = 4.8 COMPILER_VERSION = 4.8
HAVE_LEVELDB = 1 HAVE_LEVELDB = 1
@ -52,7 +52,7 @@ HAVE_LEVELDB = 1
# -mfloat-abi=hard -march=armv7-a # -mfloat-abi=hard -march=armv7-a
#TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON) #TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON)
#TARGET_LDFLAGS_ADDON = -Wl,--no-warn-mismatch -lm_hard #TARGET_LDFLAGS_ADDON = -Wl,--no-warn-mismatch -lm_hard
#TARGET_ARCH = arm #TARGET_ARCH = armv7
#CROSS_PREFIX = arm-linux-androideabi- #CROSS_PREFIX = arm-linux-androideabi-
#COMPILER_VERSION = 4.8 #COMPILER_VERSION = 4.8
#HAVE_LEVELDB = 1 #HAVE_LEVELDB = 1