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

Makefile corrections and improvements

Browse source 
Removed obsolete parts, simplified and optimized (e.g. use neon_helper
on Pi 1 also).
This commit is contained in:
Dimitris Panokostas 2016-12-04 11:35:59 +01:00
parent 634da5a8b9
commit 7b96cdf6ed
4 changed files with 11 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -20,3 +20,4 @@ kickstarts/*.rom
*.npa01
*.idx
*.dat
Amiberry/VisualGDB/Debug/Amiberry

1
Amiberry/Amiberry/Amiberry.vcxproj
View file

@ -186,7 +186,6 @@
<ClCompile Include="..\..\src\od-pandora\neon_helper.s" />
<ClCompile Include="..\..\src\od-pandora\pandora.cpp" />
<ClCompile Include="..\..\src\od-pandora\pandora_filesys.cpp" />
<ClCompile Include="..\..\src\od-pandora\pandora_gfx.cpp" />
<ClCompile Include="..\..\src\od-pandora\pandora_gui.cpp" />
<ClCompile Include="..\..\src\od-pandora\pandora_input.cpp" />
<ClCompile Include="..\..\src\od-pandora\pandora_mem.cpp" />

3
Amiberry/Amiberry/Amiberry.vcxproj.filters
View file

@ -321,9 +321,6 @@
<ClCompile Include="..\..\src\od-pandora\pandora_filesys.cpp">
<Filter>Source files\od-pandora</Filter>
</ClCompile>
<ClCompile Include="..\..\src\od-pandora\pandora_gfx.cpp">
<Filter>Source files\od-pandora</Filter>
</ClCompile>
<ClCompile Include="..\..\src\od-pandora\pandora_gui.cpp">
<Filter>Source files\od-pandora</Filter>
</ClCompile>

80
Makefile
View file

@ -3,37 +3,13 @@ ifeq ($(PLATFORM),)
endif
ifeq ($(PLATFORM),rpi3)
CPU_FLAGS += -mcpu=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard
MORE_CFLAGS += -DRASPBERRY -DCAPSLOCK_DEBIAN_WORKAROUND -DARMV6T2
LDFLAGS += -lbcm_host
HAVE_NEON = 1
HAVE_DISPMANX = 1
USE_PICASSO96 = 1
CPU_FLAGS += -march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard
MORE_CFLAGS += -DARMV6T2 -DUSE_ARMNEON
else ifeq ($(PLATFORM),rpi2)
CPU_FLAGS += -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
MORE_CFLAGS += -DRASPBERRY -DCAPSLOCK_DEBIAN_WORKAROUND -DARMV6T2
LDFLAGS += -lbcm_host
HAVE_NEON = 1
HAVE_DISPMANX = 1
USE_PICASSO96 = 1
CPU_FLAGS += -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard
MORE_CFLAGS += -DARMV6T2 -DUSE_ARMNEON
else ifeq ($(PLATFORM),rpi1)
CPU_FLAGS += -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard
MORE_CFLAGS += -DRASPBERRY -DCAPSLOCK_DEBIAN_WORKAROUND
LDFLAGS += -lbcm_host
HAVE_DISPMANX = 1
USE_PICASSO96 = 1
else ifeq ($(PLATFORM),generic-sdl)
# On Raspberry Pi uncomment below line or remove ARMV6T2 define.
CPU_FLAGS= -mcpu=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard
MORE_CFLAGS += -DARMV6T2 -DRASPBERRY -DCAPSLOCK_DEBIAN_WORKAROUND
HAVE_SDL_DISPLAY = 1
else ifeq ($(PLATFORM),gles)
# For Raspberry Pi uncomment the two below lines
LDFLAGS += -lbcm_host
CPU_FLAGS= -mcpu=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard
MORE_CFLAGS += -DARMV6T2 -DRASPBERRY -DCAPSLOCK_DEBIAN_WORKAROUND
HAVE_GLES_DISPLAY = 1
HAVE_NEON = 1
CPU_FLAGS += -march=armv6zk -mfpu=vfp -mfloat-abi=hard
endif
NAME = uae4arm
@ -55,26 +31,18 @@ PANDORA=1
SDL_CFLAGS = `sdl-config --cflags`
DEFS += `xml2-config --cflags`
DEFS += -DCPU_arm -DARM_ASSEMBLY -DARMV6_ASSEMBLY -DPANDORA
DEFS += -DWITH_INGAME_WARNING
DEFS += -DCPU_arm -DARM_ASSEMBLY -DARMV6_ASSEMBLY -DPANDORA -DPICASSO96
DEFS += -DWITH_INGAME_WARNING -DRASPBERRY -DCAPSLOCK_DEBIAN_WORKAROUND
DEFS += -DROM_PATH_PREFIX=\"./\" -DDATA_PREFIX=\"./data/\" -DSAVE_PREFIX=\"./saves/\"
DEFS += -DUSE_SDL
ifeq ($(USE_PICASSO96), 1)
DEFS += -DPICASSO96
endif
ifeq ($(HAVE_NEON), 1)
DEFS += -DUSE_ARMNEON
endif
MORE_CFLAGS += -I/opt/vc/include -I/opt/vc/include/interface/vmcs_host/linux -I/opt/vc/include/interface/vcos/pthreads
MORE_CFLAGS += -Isrc -Isrc/od-pandora -Isrc/threaddep -Isrc/menu -Isrc/include
MORE_CFLAGS += -Isrc -Isrc/od-pandora -Isrc/td-sdl -Isrc/include
MORE_CFLAGS += -Wno-unused -Wno-format -DGCCCONSTFUNC="__attribute__((const))"
MORE_CFLAGS += -fexceptions -fpermissive
LDFLAGS += -lSDL -lpthread -lm -lz -lSDL_image -lpng -lrt -lxml2 -lFLAC -lmpg123 -ldl
LDFLAGS += -lSDL_ttf -lguichan_sdl -lguichan -L/opt/vc/lib
LDFLAGS += -lSDL_ttf -lguichan_sdl -lguichan -lbcm_host -L/opt/vc/lib
ifndef DEBUG
MORE_CFLAGS += -Ofast -fomit-frame-pointer
@ -226,35 +194,10 @@ OBJS = \
src/od-pandora/gui/main_window.o \
src/od-pandora/gui/Navigation.o
ifeq ($(HAVE_DISPMANX), 1)
OBJS += src/od-rasp/rasp_gfx.o
endif
ifeq ($(HAVE_SDL_DISPLAY), 1)
OBJS += src/od-pandora/pandora_gfx.o
endif
ifeq ($(HAVE_GLES_DISPLAY), 1)
OBJS += src/od-gles/gl.o
OBJS += src/od-gles/gl_platform.o
OBJS += src/od-gles/gles_gfx.o
MORE_CFLAGS += -DHAVE_GLES
LDFLAGS += -ldl -lEGL -lGLESv1_CM
endif
ifdef PANDORA
OBJS += src/od-pandora/gui/sdltruetypefont.o
endif
ifeq ($(USE_PICASSO96), 1)
OBJS += src/od-pandora/picasso96.o
endif
ifeq ($(HAVE_NEON), 1)
OBJS += src/od-pandora/picasso96.o
OBJS += src/od-pandora/neon_helper.o
else
OBJS += src/od-pandora/arm_helper.o
endif
OBJS += src/newcpu.o
OBJS += src/newcpu_common.o
@ -272,9 +215,6 @@ OBJS += src/jit/compemu_support.o
src/od-pandora/neon_helper.o: src/od-pandora/neon_helper.s
$(CXX) $(CPU_FLAGS) -Wall -o src/od-pandora/neon_helper.o -c src/od-pandora/neon_helper.s
src/od-pandora/arm_helper.o: src/od-pandora/arm_helper.s
$(CXX) $(CPU_FLAGS) -Wall -o src/od-pandora/arm_helper.o -c src/od-pandora/arm_helper.s
src/trace.o: src/trace.c
$(CC) $(MORE_CFLAGS) -c src/trace.c -o src/trace.o