atria-tools/lutin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] select arm version

Browse Source
This commit is contained in:
Edouard DUPIN 2013-01-11 07:25:09 +01:00
parent 94dbc0b475
commit b6377e0477
2 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.Android.mk
View File

@ -9,10 +9,11 @@ include $(BUILD_SYSTEM)/core/check-project-variable.mk
PROJECT_NDK?=.. PROJECT_NDK?=..
TARGET_OS = Android TARGET_OS := Android
TARGET_ARCH = ARM #TARGET_ARCH := ARM
TARGET_CROSS = $(PROJECT_NDK)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi- TARGET_ARCH := ARMv7
TARGET_CROSS_CLANG = $(PROJECT_NDK)/toolchains/llvm-3.1/prebuilt/linux-x86/bin/ TARGET_CROSS := $(PROJECT_NDK)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-
TARGET_CROSS_CLANG := $(PROJECT_NDK)/toolchains/llvm-3.1/prebuilt/linux-x86/bin/
TARGET_OUT_FOLDER_BINARY := ERROR_NOTHING_MUST_BE_SET_HERE TARGET_OUT_FOLDER_BINARY := ERROR_NOTHING_MUST_BE_SET_HERE
TARGET_OUT_FOLDER_LIBRAIRY := data/lib/armeabi TARGET_OUT_FOLDER_LIBRAIRY := data/lib/armeabi

21
core/setup-target.mk
View File

@ -73,24 +73,29 @@ ifeq ("$(TARGET_OS)","Windows")
$(error CLANG is not supported on $(TARGET_OS) platform ==> disable it) $(error CLANG is not supported on $(TARGET_OS) platform ==> disable it)
endif endif
else ifeq ("$(TARGET_OS)","Android") else ifeq ("$(TARGET_OS)","Android")
ifeq ("$(TARGET_ARCH)","ARM")
# ----------------------- # -----------------------
# -- arm V5 (classicle) : # -- arm V5 (classicle) :
# ----------------------- # -----------------------
#ifeq ("$(CLANG)","1") ifeq ("$(CLANG)","1")
# TARGET_GLOBAL_CFLAGS += -march=arm TARGET_GLOBAL_CFLAGS += -march=arm
#else else
# TARGET_GLOBAL_CFLAGS += -march=armv5te -msoft-float -mthumb TARGET_GLOBAL_CFLAGS += -march=armv5te -msoft-float -mthumb
#endif endif
#TARGET_GLOBAL_CFLAGS += -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ TARGET_GLOBAL_CFLAGS += -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__
else
# ----------------------- # -----------------------
# -- arm V7 (Neon) : # -- arm V7 (Neon) :
# ----------------------- # -----------------------
ifeq ("$(CLANG)","1") ifeq ("$(CLANG)","1")
TARGET_GLOBAL_CFLAGS += -march=armv7 TARGET_GLOBAL_CFLAGS += -march=armv7
else else
TARGET_GLOBAL_CFLAGS += -mfloat-abi=softfp -mfpu=neon TARGET_GLOBAL_CFLAGS += -mfpu=neon -mfloat-abi=softfp
#TARGET_GLOBAL_CFLAGS += -march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp
TARGET_GLOBAL_LDFLAGS += -mfpu=neon -mfloat-abi=softfp
endif endif
TARGET_GLOBAL_CFLAGS += -D__ARM_ARCH_7__ -D__ARM_NEON__ TARGET_GLOBAL_CFLAGS += -D__ARM_ARCH_7__ -D__ARM_NEON__
endif
# ----------------------- # -----------------------
# -- Common flags : # -- Common flags :
# ----------------------- # -----------------------
@ -102,7 +107,7 @@ else ifeq ("$(TARGET_OS)","Android")
endif endif
TARGET_GLOBAL_CPPFLAGS += -fno-rtti -Wa,--noexecstack TARGET_GLOBAL_CPPFLAGS += -fno-rtti -Wa,--noexecstack
TARGET_GLOBAL_LDFLAGS +=
else ifeq ("$(TARGET_OS)","Linux") else ifeq ("$(TARGET_OS)","Linux")
else ifeq ("$(TARGET_OS)","MacOs") else ifeq ("$(TARGET_OS)","MacOs")