summaryrefslogtreecommitdiff
path: root/build/android/Makefile
diff options
context:
space:
mode:
authorsapier <Sapier at GMX dot net>2015-01-08 00:11:00 +0100
committersapier <Sapier at GMX dot net>2015-01-08 00:11:30 +0100
commit04d4a00393a6eaa6b2c7681b2cd799dc2d2de3fb (patch)
tree4f878385c62e4e3bbb0eb4e086cb9c2c1a0940dc /build/android/Makefile
parent2504da28afcaf34235c760f13da1f0fc615aa10b (diff)
downloadminetest-04d4a00393a6eaa6b2c7681b2cd799dc2d2de3fb.tar.gz
minetest-04d4a00393a6eaa6b2c7681b2cd799dc2d2de3fb.tar.bz2
minetest-04d4a00393a6eaa6b2c7681b2cd799dc2d2de3fb.zip
Fix armv7 using arm arch while arm uses armv7
Diffstat (limited to 'build/android/Makefile')
-rw-r--r--build/android/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/android/Makefile b/build/android/Makefile
index ae1165157..e160716d3 100644
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -36,7 +36,7 @@ TARGET_ABI = armeabi
TARGET_LIBDIR = armeabi
TARGET_TOOLCHAIN = arm-linux-androideabi-
TARGET_CFLAGS_ADDON = -mfloat-abi=softfp -mfpu=vfp
-TARGET_ARCH = armv7
+TARGET_ARCH = arm
CROSS_PREFIX = arm-linux-androideabi-
COMPILER_VERSION = 4.8
HAVE_LEVELDB = 1
@@ -52,7 +52,7 @@ HAVE_LEVELDB = 1
# -mfloat-abi=hard -march=armv7-a
#TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON)
#TARGET_LDFLAGS_ADDON = -Wl,--no-warn-mismatch -lm_hard
-#TARGET_ARCH = arm
+#TARGET_ARCH = armv7
#CROSS_PREFIX = arm-linux-androideabi-
#COMPILER_VERSION = 4.8
#HAVE_LEVELDB = 1