X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2FMakefile;h=5b8b0398c1ae15c1768e569e794efc61239646dd;hb=c7a4ff64287b12487c7e9cc13ce3b7d2aa6e1f06;hp=d6ba1d5bc191ee32a47bb084a39c5c2c8241e185;hpb=2fb6c387829e4a8cabb7f45490a8aa792d068ee0;p=libpicofe.git

diff --git a/gp2x/Makefile b/gp2x/Makefile
index d6ba1d5..5b8b039 100644
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -5,20 +5,34 @@ CROSS = arm-linux-
 #CROSS = $(devkit_path)bin/arm-linux-
 
 # settings
-dprint = 1
 #mz80 = 1
 #debug_cyclone = 1
-asm_memory = 0	# TODO
+asm_memory = 1
 asm_render = 1
 asm_ym2612 = 1
 asm_misc = 1
 asm_cdpico = 1
+asm_cdmemory = 1
+amalgamate = 0
 #profile = 1
 #use_musashi = 1
 #up = 1
 
+
+ifeq "$(debug_cyclone)" "1"
+use_cyclone = 1
+use_musashi = 1
+endif
+ifeq "$(use_musashi)" "1"
+asm_cdpico = 0
+asm_memory = 0
+asm_cdmemory = 0
+else
+use_cyclone = 1
+endif
+
 DEFINC = -I../.. -I. -DARM -D__GP2X__ -D_UNZIP_SUPPORT # -DBENCHMARK
-COPT_COMMON = -static -O3 -ftracer -fstrength-reduce -Wall -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math # -s
+COPT_COMMON = -static -Wall -O2 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math
 ifeq "$(profile)" "1"
 COPT_COMMON += -fprofile-generate
 endif
@@ -34,17 +48,26 @@ LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy
 
 # frontend
-OBJS += main.o menu.o fonts.o gp2x.o usbjoy.o emu.o squidgehack.o asmutils.o cpuctrl.o
+OBJS += main.o menu.o gp2x.o usbjoy.o emu.o squidgehack.o cpuctrl.o
 # 940 core control
 OBJS += 940ctl.o
+
+# common
+OBJS += ../common/menu.o ../common/fonts.o ../common/arm_utils.o ../common/readpng.o
+
 # Pico
-OBJS += ../../Pico/Area.o ../../Pico/Cart.o ../../Pico/Utils.o ../../Pico/Memory.o ../../Pico/Misc.o \
+ifeq "$(amalgamate)" "1"
+OBJS += ../../PicoAll.o
+else
+OBJS += ../../Pico/Area.o ../../Pico/Cart.o ../../Pico/Memory.o ../../Pico/Misc.o \
 		../../Pico/Pico.o ../../Pico/Sek.o ../../Pico/VideoPort.o ../../Pico/Draw2.o ../../Pico/Draw.o \
 		../../Pico/Patch.o
 # Pico - CD
 OBJS += ../../Pico/cd/Pico.o ../../Pico/cd/Memory.o ../../Pico/cd/Sek.o ../../Pico/cd/LC89510.o \
 		../../Pico/cd/cd_sys.o ../../Pico/cd/cd_file.o ../../Pico/cd/gfx_cd.o \
 		../../Pico/cd/Area.o ../../Pico/cd/Misc.o ../../Pico/cd/pcm.o ../../Pico/cd/buffering.o
+endif
+
 # asm stuff
 ifeq "$(asm_render)" "1"
 DEFINC += -D_ASM_DRAW_C
@@ -61,14 +84,23 @@ endif
 ifeq "$(asm_misc)" "1"
 DEFINC += -D_ASM_MISC_C
 OBJS += ../../Pico/misc_asm.o
+OBJS += ../../Pico/cd/misc_asm.o
 endif
 ifeq "$(asm_cdpico)" "1"
 DEFINC += -D_ASM_CD_PICO_C
 OBJS += ../../Pico/cd/pico_asm.o
 endif
+ifeq "$(asm_cdmemory)" "1"
+DEFINC += -D_ASM_CD_MEMORY_C
+OBJS += ../../Pico/cd/memory_asm.o
+endif
+
 # Pico - sound
+ifneq "$(amalgamate)" "1"
+OBJS += ../../Pico/sound/sound.o
+endif
 OBJS += ../../Pico/sound/mix_asm.o
-OBJS += ../../Pico/sound/sound.o ../../Pico/sound/sn76496.o ../../Pico/sound/ym2612.o
+OBJS += ../../Pico/sound/sn76496.o ../../Pico/sound/ym2612.o
 # zlib
 OBJS += ../../zlib/gzio.o ../../zlib/inffast.o ../../zlib/inflate.o ../../zlib/inftrees.o ../../zlib/trees.o \
 	../../zlib/deflate.o ../../zlib/crc32.o ../../zlib/adler32.o ../../zlib/zutil.o ../../zlib/compress.o
@@ -76,11 +108,16 @@ OBJS += ../../zlib/gzio.o ../../zlib/inffast.o ../../zlib/inflate.o ../../zlib/i
 OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o
 # mp3
 OBJS += mp3.o
+# debug
+ifeq "$(debug_cyclone)" "1"
+OBJS += ../../Pico/_cyclone_debug.o ../../cpu/musashi/m68kdasm.o
+endif
 # CPU cores
 ifeq "$(use_musashi)" "1"
 DEFINC += -DEMU_M68K
-OBJS += _build\m68kcpu.o _build\m68kopac.o _build\m68kopdm.o _build\m68kopnz.o _build\m68kops.o
-else
+OBJS += ../../cpu/musashi/m68kops.o ../../cpu/musashi/m68kcpu.o
+endif
+ifeq "$(use_cyclone)" "1"
 DEFINC += -DEMU_C68K
 OBJS += ../../cpu/Cyclone/proj/Cyclone.o
 endif
@@ -98,7 +135,7 @@ all: PicoDrive.gpe
 
 PicoDrive.gpe : $(OBJS) helix/helix_mp3.a
 	@echo $@
-	@$(GCC) -o $@ $(COPT) $^ -lm -Wl,-Map=PicoDrive.map
+	@$(GCC) -o $@ $(COPT) $^ -lm -lpng -Wl,-Map=PicoDrive.map
 ifeq ($(DEBUG),)
 	@$(STRIP) $@
 endif
@@ -109,12 +146,12 @@ ifeq "$(up)" "1"
 endif
 
 up: PicoDrive.gpe
-	@cp -v PicoDrive.gpe /mnt/gp2x/mnt/sd/games/PicoDrive/
+	@cp -v PicoDrive.gpe /mnt/gp2x/mnt/sd/emus/PicoDrive/
 
 #	@cmd //C copy PicoDrive.gpe \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\
 
 
-testrefr.gpe : test.o gp2x.o asmutils.o
+testrefr.gpe : test.o gp2x.o
 	@echo $@
 	@$(GCC) $(COPT) $^ -o $@
 	@$(STRIP) $@
@@ -147,11 +184,21 @@ testrefr.gpe : test.o gp2x.o asmutils.o
 ../../Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s
 	@echo $<
 	@$(AS) $(ASOPT) $< -o $@
+../../Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s
+	@echo $<
+	@$(AS) $(ASOPT) $< -o $@
+../../Pico/cd/misc_asm.o : ../../Pico/cd/misc.s
+	@echo $<
+	@$(AS) $(ASOPT) $< -o $@
 
 # build Cyclone
 ../../cpu/Cyclone/proj/Cyclone.s :
 	@echo building Cyclone...
-	@make -C ../../cpu/Cyclone/proj -f Makefile.linux
+	@make -C ../../cpu/Cyclone/proj CONFIG_FILE=config_pico.h
+
+../../cpu/musashi/m68kops.c :
+	@make -C ../../cpu/musashi
+
 
 # build helix libs
 helix/helix_mp3.a:
@@ -177,23 +224,10 @@ $(error need VER)
 endif
 endif
 
-rel: PicoDrive.gpe code940/code940.bin ../readme.txt config.txt
+rel: PicoDrive.gpe code940/pico940.bin ../readme.txt config.txt PicoDrive.man.txt PicoDrive.png
 	zip -9 -j ../../PicoDrive_$(VER).zip $^ mmuhack.o
+	zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt
 
 code940/code940.bin:
 	make -C code940/
 
-
-# test
-usbjoy.o : usbjoy.c
-	@echo $<
-	@$(GCC) $(COPT) $(DEFINC) -fno-profile-generate -c $< -o $@
-
-../../Pico/Cart.o : ../../Pico/Cart.c
-	@echo $<
-	@$(GCC) $(COPT) $(DEFINC) -fno-profile-generate -c $< -o $@
-
-../../zlib/trees.o : ../../zlib/trees.c
-	@echo $<
-	@$(GCC) $(COPT) $(DEFINC) -fno-profile-generate -c $< -o $@
-