some skinning capabilities

[libpicofe.git] / gp2x / Makefile

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 07f9992..e9ffd46 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -5,7 +5,6 @@ CROSS = arm-linux-
 #CROSS = $(devkit_path)bin/arm-linux-\r
 \r
 # settings\r
-dprint = 1\r
 #mz80 = 1\r
 #debug_cyclone = 1\r
 asm_memory = 1\r
@@ -18,8 +17,21 @@ asm_cdmemory = 1
 #use_musashi = 1\r
 #up = 1\r
 \r
+\r
+ifeq "$(debug_cyclone)" "1"\r
+use_cyclone = 1\r
+use_musashi = 1\r
+endif\r
+ifeq "$(use_musashi)" "1"\r
+asm_cdpico = 0\r
+asm_memory = 0\r
+asm_cdmemory = 0\r
+else\r
+use_cyclone = 1\r
+endif\r
+\r
 DEFINC = -I../.. -I. -DARM -D__GP2X__ -D_UNZIP_SUPPORT # -DBENCHMARK\r
-COPT_COMMON = -static -O3 -ftracer -fstrength-reduce -Wall -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math # -s\r
+COPT_COMMON = -static -Wall -O3 -ftracer -fstrength-reduce -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math # -s\r
 ifeq "$(profile)" "1"\r
 COPT_COMMON += -fprofile-generate\r
 endif\r
@@ -35,7 +47,7 @@ LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy\r
 \r
 # frontend\r
-OBJS += main.o menu.o fonts.o gp2x.o usbjoy.o emu.o squidgehack.o asmutils.o cpuctrl.o\r
+OBJS += main.o menu.o fonts.o gp2x.o usbjoy.o emu.o squidgehack.o asmutils.o cpuctrl.o readpng.o\r
 # 940 core control\r
 OBJS += 940ctl.o\r
 # Pico\r
@@ -62,6 +74,7 @@ endif
 ifeq "$(asm_misc)" "1"\r
 DEFINC += -D_ASM_MISC_C\r
 OBJS += ../../Pico/misc_asm.o\r
+OBJS += ../../Pico/cd/misc_asm.o\r
 endif\r
 ifeq "$(asm_cdpico)" "1"\r
 DEFINC += -D_ASM_CD_PICO_C\r
@@ -81,12 +94,16 @@ OBJS += ../../zlib/gzio.o ../../zlib/inffast.o ../../zlib/inflate.o ../../zlib/i
 OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o\r
 # mp3\r
 OBJS += mp3.o\r
+# debug\r
+ifeq "$(debug_cyclone)" "1"\r
+OBJS += ../../Pico/_cyclone_debug.o ../../cpu/musashi/m68kdasm.o\r
+endif\r
 # CPU cores\r
 ifeq "$(use_musashi)" "1"\r
 DEFINC += -DEMU_M68K\r
-OBJS += ../../cpu/musashi/m68kcpu.o ../../cpu/musashi/m68kopac.o ../../cpu/musashi/m68kopdm.o\r
-OBJS += ../../cpu/musashi/m68kopnz.o ../../cpu/musashi/m68kops.o\r
-else\r
+OBJS += ../../cpu/musashi/m68kops.o ../../cpu/musashi/m68kcpu.o\r
+endif\r
+ifeq "$(use_cyclone)" "1"\r
 DEFINC += -DEMU_C68K\r
 OBJS += ../../cpu/Cyclone/proj/Cyclone.o\r
 endif\r
@@ -104,7 +121,7 @@ all: PicoDrive.gpe
 \r
 PicoDrive.gpe : $(OBJS) helix/helix_mp3.a\r
        @echo $@\r
-       @$(GCC) -o $@ $(COPT) $^ -lm -Wl,-Map=PicoDrive.map\r
+       @$(GCC) -o $@ $(COPT) $^ -lm -lpng -Wl,-Map=PicoDrive.map\r
 ifeq ($(DEBUG),)\r
        @$(STRIP) $@\r
 endif\r
@@ -115,7 +132,7 @@ ifeq "$(up)" "1"
 endif\r
 \r
 up: PicoDrive.gpe\r
-       @cp -v PicoDrive.gpe /mnt/gp2x/mnt/sd/games/PicoDrive/\r
+       @cp -v PicoDrive.gpe /mnt/gp2x/mnt/sd/emus/PicoDrive/\r
 \r
 #      @cmd //C copy PicoDrive.gpe \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\\r
 \r
@@ -156,11 +173,18 @@ testrefr.gpe : test.o gp2x.o asmutils.o
 ../../Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s\r
        @echo $<\r
        @$(AS) $(ASOPT) $< -o $@\r
+../../Pico/cd/misc_asm.o : ../../Pico/cd/misc.s\r
+       @echo $<\r
+       @$(AS) $(ASOPT) $< -o $@\r
 \r
 # build Cyclone\r
 ../../cpu/Cyclone/proj/Cyclone.s :\r
        @echo building Cyclone...\r
-       @make -C ../../cpu/Cyclone/proj -f Makefile.linux\r
+       @make -C ../../cpu/Cyclone/proj CONFIG_FILE=config_pico.h\r
+\r
+../../cpu/musashi/m68kops.c :\r
+       @make -C ../../cpu/musashi\r
+\r
 \r
 # build helix libs\r
 helix/helix_mp3.a:\r
@@ -186,23 +210,24 @@ $(error need VER)
 endif\r
 endif\r
 \r
-rel: PicoDrive.gpe code940/code940.bin ../readme.txt config.txt\r
+rel: PicoDrive.gpe code940/pico940.bin ../readme.txt config.txt PicoDrive.man.txt PicoDrive.png\r
        zip -9 -j ../../PicoDrive_$(VER).zip $^ mmuhack.o\r
+       zip -9 PicoDrive_$(VER).zip skin\r
 \r
 code940/code940.bin:\r
        make -C code940/\r
 \r
 \r
 # test\r
-usbjoy.o : usbjoy.c\r
-       @echo $<\r
-       @$(GCC) $(COPT) $(DEFINC) -fno-profile-generate -c $< -o $@\r
-\r
-../../Pico/Cart.o : ../../Pico/Cart.c\r
-       @echo $<\r
-       @$(GCC) $(COPT) $(DEFINC) -fno-profile-generate -c $< -o $@\r
-\r
-../../zlib/trees.o : ../../zlib/trees.c\r
-       @echo $<\r
-       @$(GCC) $(COPT) $(DEFINC) -fno-profile-generate -c $< -o $@\r
+#usbjoy.o : usbjoy.c\r
+#      @echo $<\r
+#      @$(GCC) $(COPT) $(DEFINC) -fno-profile-generate -c $< -o $@\r
+#\r
+#../../Pico/Cart.o : ../../Pico/Cart.c\r
+#      @echo $<\r
+#      @$(GCC) $(COPT) $(DEFINC) -fno-profile-generate -c $< -o $@\r
+#\r
+#../../zlib/trees.o : ../../zlib/trees.c\r
+#      @echo $<\r
+#      @$(GCC) $(COPT) $(DEFINC) -fno-profile-generate -c $< -o $@\r
 \r