misv fixes

[libpicofe.git] / pandora / Makefile

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