X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fpandora%2FMakefile;h=9cd4e1f6ca662d87979c97db4f88e2c3b0a02d50;hb=6a13ef3f56a80ac698d463f5d00235ea2a090f52;hp=ffa1d7230c398a40c83c5cb73acf7415d370c537;hpb=3a3947cd905ca45447ea4ea0aca45cdf0f79a47a;p=picodrive.git

diff --git a/platform/pandora/Makefile b/platform/pandora/Makefile
index ffa1d72..9cd4e1f 100644
--- a/platform/pandora/Makefile
+++ b/platform/pandora/Makefile
@@ -2,6 +2,7 @@ export CROSS = arm-none-linux-gnueabi-
 
 # settings
 #mz80 = 1
+#cz80 = 1
 #debug_cyclone = 1
 asm_memory = 1
 asm_render = 1
@@ -12,7 +13,7 @@ asm_cdmemory = 1
 amalgamate = 0
 #profile = 1
 #use_musashi = 1
-#up = 1
+#use_famec = 1
 
 
 ifeq "$(debug_cyclone)" "1"
@@ -28,9 +29,9 @@ use_cyclone = 1
 endif
 
 DEFINC = -I../.. -I. -DARM -DPANDORA
-COPT_COMMON = -static -Wall -Winline
+COPT_COMMON = -Wall -Winline -mcpu=cortex-a8 -mtune=cortex-a8 -march=armv7-a
 ifeq ($(DEBUG),)
-COPT_COMMON += -O3 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math
+COPT_COMMON += -O2 # -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math
 else
 COPT_COMMON += -ggdb
 endif
@@ -49,7 +50,7 @@ LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy
 
 # frontend
-OBJS += pandora.o main.o platform/gp2x/menu.o platform/gp2x/usbjoy.o platform/gp2x/emu.o
+OBJS += pandora.o main.o emu.o asm_utils.o platform/gp2x/menu.o platform/gp2x/usbjoy.o
 
 # common
 OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \
@@ -123,14 +124,23 @@ ifeq "$(use_cyclone)" "1"
 DEFINC += -DEMU_C68K
 OBJS += cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o
 endif
+ifeq "$(use_famec)" "1"
+DEFINC += -DEMU_F68K
+OBJS += cpu/fame/famec.o
+endif
 # drz80/mz80
 ifeq "$(mz80)" "1"
 DEFINC += -D_USE_MZ80
 OBJS += cpu/mz80/mz80.o
 else
+ifeq "$(cz80)" "1"
+DEFINC += -D_USE_CZ80
+OBJS += cpu/cz80/cz80.o
+else
 DEFINC += -D_USE_DRZ80
 OBJS += cpu/DrZ80/drz80.o
 endif
+endif
 
 vpath %.c = ../..
 vpath %.s = ../..
@@ -141,7 +151,7 @@ DIRS = platform platform/gp2x platform/common Pico Pico/cd Pico/Pico Pico/sound
 
 all: mkdirs PicoDrive
 
-PicoDrive : $(OBJS) ../common/helix/helix_mp3.a
+PicoDrive : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a
 	@echo ">>>" $@
 	$(GCC) -o $@ $(COPT) $^ -lm -Wl,-Map=PicoDrive.map # -lpng
 ifeq ($(DEBUG),)
@@ -218,8 +228,8 @@ Pico/Pico.o Pico/cd/Pico.o: ../../Pico/PicoFrameHints.c ../../Pico/PicoInt.h
 Pico/Memory.o Pico/cd/Memory.o : ../../Pico/MemoryCmn.c ../../Pico/PicoInt.h
 
 # build helix libs
-../common/helix/helix_mp3.a:
-	make -C ../common/helix
+../common/helix/$(CROSS)helix-mp3.a:
+	make -C ../common/helix clean all
 
 readme.txt: ../../tools/textfilter ../base_readme.txt
 	../../tools/textfilter ../base_readme.txt $@ GP2X