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

v2.13: Merge remote-tracking branch 'origin/dev'

Browse source
This commit is contained in:
Dimitris Panokostas 2018-02-11 15:43:58 +01:00
commit e49e33f9ae
99 changed files with 35013 additions and 472 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Makefile
View file

@ -39,22 +39,11 @@ else ifeq ($(PLATFORM),rpi1)
CPU_FLAGS += -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp
CFLAGS += ${DISPMANX_FLAGS} -DUSE_SDL1
LDFLAGS += ${DISPMANX_LDFLAGS}
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
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
NAME = amiberry-rpi1-sdl1
else ifeq ($(PLATFORM),android)
CPU_FLAGS += -mfpu=neon -mfloat-abi=soft
DEFS += -DANDROIDSDL
DEFS += -DANDROIDSDL -DARMV6T2 -DUSE_ARMNEON -DUSE_SDL1
ANDROID = 1
HAVE_NEON = 1
HAVE_SDL_DISPLAY = 1
@ -117,12 +106,12 @@ USE_SDL2 = 1
CXX = arm-linux-gnueabihf-g++
NAME = amiberry-pine64-sdl2
else ifeq ($(PLATFORM),xu4-sdl2)
else ifeq ($(PLATFORM),xu4)
USE_SDL2 = 1
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
HAVE_NEON = 1
NAME = amiberry-xu4-sdl2
NAME = amiberry-xu4
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.
@ -140,7 +129,7 @@ USE_SDL2 = 1
else ifeq ($(PLATFORM),android-sdl2)
USE_SDL2 = 1
CPU_FLAGS += -mfpu=neon -mfloat-abi=soft
DEFS += -DANDROIDSDL
DEFS += -DANDROIDSDL -DARMV6T2 -DUSE_ARMNEON -DUSE_SDL2
ANDROID = 1
HAVE_NEON = 1
HAVE_SDL_DISPLAY = 1
@ -243,6 +232,7 @@ OBJS = \
src/devices.o \
src/disk.o \
src/diskutil.o \
src/dlopen.o \
src/drawing.o \
src/events.o \
src/expansion.o \
@ -318,6 +308,7 @@ OBJS = \
src/archivers/mp2/kjmp2.o \
src/archivers/wrp/warp.o \
src/archivers/zip/unzip.o \
src/caps/caps_win32.o \
src/machdep/support.o \
src/osdep/bsdsocket_host.o \
src/osdep/cda_play.o \