pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Makefile: added missing USE_SDLx define for Android platform, removed unused SDL1-XU4 target

Browse source
This commit is contained in:
Dimitris Panokostas 2018-02-06 21:36:25 +01:00
parent 794f38f079
commit fba61a387f
1 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Makefile
View file

@ -41,20 +41,9 @@ else ifeq ($(PLATFORM),rpi1)
LDFLAGS += ${DISPMANX_LDFLAGS} LDFLAGS += ${DISPMANX_LDFLAGS}
NAME = amiberry-rpi1-sdl1-dev NAME = amiberry-rpi1-sdl1-dev
else ifeq ($(PLATFORM),xu4)
CPU_FLAGS += -march=armv7ve -mcpu=cortex-a15.cortex-a7 -mtune=cortex-a15.cortex-a7 -mfpu=neon-vfpv4
CFLAGS += -DARMV6T2 -DUSE_ARMNEON -DUSE_SDL1 -DMALI_GPU
HAVE_NEON = 1
NAME = amiberry-xu4-sdl1-dev
ifdef DEBUG
# Otherwise we'll get compilation errors, check https://tls.mbed.org/kb/development/arm-thumb-error-r7-cannot-be-used-in-asm-here
# quote: The assembly code in bn_mul.h is optimized for the ARM platform and uses some registers, including r7 to efficiently do an operation. GCC also uses r7 as the frame pointer under ARM Thumb assembly.
MORE_CFLAGS += -fomit-frame-pointer
endif
else ifeq ($(PLATFORM),android) else ifeq ($(PLATFORM),android)
CPU_FLAGS += -mfpu=neon -mfloat-abi=soft CPU_FLAGS += -mfpu=neon -mfloat-abi=soft
DEFS += -DANDROIDSDL DEFS += -DANDROIDSDL -DUSE_SDL1
ANDROID = 1 ANDROID = 1
HAVE_NEON = 1 HAVE_NEON = 1
HAVE_SDL_DISPLAY = 1 HAVE_SDL_DISPLAY = 1
@ -117,12 +106,12 @@ USE_SDL2 = 1
CXX = arm-linux-gnueabihf-g++ CXX = arm-linux-gnueabihf-g++
NAME = amiberry-pine64-sdl2-dev NAME = amiberry-pine64-sdl2-dev
else ifeq ($(PLATFORM),xu4-sdl2) else ifeq ($(PLATFORM),xu4)
USE_SDL2 = 1 USE_SDL2 = 1
CPU_FLAGS += -march=armv7ve -mcpu=cortex-a15.cortex-a7 -mtune=cortex-a15.cortex-a7 -mfpu=neon-vfpv4 CPU_FLAGS += -march=armv7ve -mcpu=cortex-a15.cortex-a7 -mtune=cortex-a15.cortex-a7 -mfpu=neon-vfpv4
CFLAGS += -DARMV6T2 -DUSE_ARMNEON -DUSE_SDL2 -DMALI_GPU CFLAGS += -DARMV6T2 -DUSE_ARMNEON -DUSE_SDL2 -DMALI_GPU
HAVE_NEON = 1 HAVE_NEON = 1
NAME = amiberry-xu4-sdl2-dev NAME = amiberry-xu4-dev
ifdef DEBUG ifdef DEBUG
# Otherwise we'll get compilation errors, check https://tls.mbed.org/kb/development/arm-thumb-error-r7-cannot-be-used-in-asm-here # Otherwise we'll get compilation errors, check https://tls.mbed.org/kb/development/arm-thumb-error-r7-cannot-be-used-in-asm-here
# quote: The assembly code in bn_mul.h is optimized for the ARM platform and uses some registers, including r7 to efficiently do an operation. GCC also uses r7 as the frame pointer under ARM Thumb assembly. # quote: The assembly code in bn_mul.h is optimized for the ARM platform and uses some registers, including r7 to efficiently do an operation. GCC also uses r7 as the frame pointer under ARM Thumb assembly.
@ -140,7 +129,7 @@ USE_SDL2 = 1
else ifeq ($(PLATFORM),android-sdl2) else ifeq ($(PLATFORM),android-sdl2)
USE_SDL2 = 1 USE_SDL2 = 1
CPU_FLAGS += -mfpu=neon -mfloat-abi=soft CPU_FLAGS += -mfpu=neon -mfloat-abi=soft
DEFS += -DANDROIDSDL DEFS += -DANDROIDSDL -DUSE_SDL2
ANDROID = 1 ANDROID = 1
HAVE_NEON = 1 HAVE_NEON = 1
HAVE_SDL_DISPLAY = 1 HAVE_SDL_DISPLAY = 1