X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2FMakefile;h=4ebecb447bcf5df96ffa8257c403b9d7dc1b715a;hb=6af8fee5348a8f90be23eb8f74fcfe2b5b28e60e;hp=f698a8f7379fcc37efd56a8e867da8d8d3f46a3c;hpb=90014ab45fb805fafdc866eed02f644d882cf32a;p=libpicofe.git

diff --git a/gp2x/Makefile b/gp2x/Makefile
index f698a8f..4ebecb4 100644
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -1,7 +1,7 @@
 
 # you may or may not need to change this
 #devkit_path = x:/stuff/dev/devkitgp2x/
-CROSS = arm-linux-
+export CROSS = arm-linux-
 #CROSS = $(devkit_path)bin/arm-linux-
 
 # settings
@@ -13,7 +13,7 @@ asm_ym2612 = 1
 asm_misc = 1
 asm_cdpico = 1
 asm_cdmemory = 1
-amalgamate = 1
+amalgamate = 0
 #profile = 1
 #use_musashi = 1
 #up = 1
@@ -31,8 +31,13 @@ else
 use_cyclone = 1
 endif
 
-DEFINC = -I../.. -I. -DARM -D__GP2X__ -D_UNZIP_SUPPORT # -DBENCHMARK
-COPT_COMMON = -static -Wall -O3 -ftracer -fstrength-reduce -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math # -s
+DEFINC = -I../.. -I. -DARM -D__GP2X__ # -DBENCHMARK
+COPT_COMMON = -static -Wall -Winline
+ifeq ($(DEBUG),)
+COPT_COMMON += -O3 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math
+else
+COPT_COMMON += -ggdb
+endif
 ifeq "$(profile)" "1"
 COPT_COMMON += -fprofile-generate
 endif
@@ -48,10 +53,14 @@ 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 readpng.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/emu.o ../common/menu.o ../common/fonts.o ../common/config.o ../common/arm_utils.o \
+	../common/readpng.o ../common/mp3_helix.o
+
 # Pico
 ifeq "$(amalgamate)" "1"
 OBJS += ../../PicoAll.o
@@ -61,9 +70,14 @@ OBJS += ../../Pico/Area.o ../../Pico/Cart.o ../../Pico/Memory.o ../../Pico/Misc.
 		../../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/cd_sys.o ../../Pico/cd/cd_file.o ../../Pico/cd/cue.o ../../Pico/cd/gfx_cd.o \
 		../../Pico/cd/Area.o ../../Pico/cd/Misc.o ../../Pico/cd/pcm.o ../../Pico/cd/buffering.o
 endif
+# Pico - Pico
+OBJS += ../../Pico/Pico/Pico.o ../../Pico/Pico/Memory.o ../../Pico/Pico/xpcm.o
+# Pico - carthw
+OBJS += ../../Pico/carthw/carthw.o ../../Pico/carthw/svp/svp.o ../../Pico/carthw/svp/Memory.o \
+		../../Pico/carthw/svp/ssp16.o ../../Pico/carthw/svp/compiler.o ../../Pico/carthw/svp/stub_arm.o
 
 # asm stuff
 ifeq "$(asm_render)" "1"
@@ -103,11 +117,9 @@ OBJS += ../../zlib/gzio.o ../../zlib/inffast.o ../../zlib/inflate.o ../../zlib/i
 	../../zlib/deflate.o ../../zlib/crc32.o ../../zlib/adler32.o ../../zlib/zutil.o ../../zlib/compress.o
 # unzip
 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
+OBJS += ../../Pico/Debug.o ../../cpu/musashi/m68kdasm.o
 endif
 # CPU cores
 ifeq "$(use_musashi)" "1"
@@ -130,16 +142,11 @@ endif
 
 all: PicoDrive.gpe
 
-PicoDrive.gpe : $(OBJS) helix/helix_mp3.a
-	@echo $@
-	@$(GCC) -o $@ $(COPT) $^ -lm -lpng -Wl,-Map=PicoDrive.map
+PicoDrive.gpe : $(OBJS) ../common/helix/helix_mp3.a
+	@echo ">>>" $@
+	$(GCC) -o $@ $(COPT) $^ -lm -lpng -Wl,-Map=PicoDrive.map
 ifeq ($(DEBUG),)
-	@$(STRIP) $@
-endif
-#	@$(GCC) $(COPT) $(OBJS) -lm -o PicoDrive_.gpe
-#	@gpecomp PicoDrive_.gpe $@
-ifeq "$(up)" "1"
-	@cmd //C copy $@ \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\
+	$(STRIP) $@
 endif
 
 up: PicoDrive.gpe
@@ -148,45 +155,45 @@ up: PicoDrive.gpe
 #	@cmd //C copy PicoDrive.gpe \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\
 
 
-testrefr.gpe : test.o gp2x.o asmutils.o
-	@echo $@
-	@$(GCC) $(COPT) $^ -o $@
-	@$(STRIP) $@
-
 .c.o:
-	@echo $<
-	@$(GCC) $(COPT) $(DEFINC) -c $< -o $@
+	@echo ">>>" $<
+	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
 .s.o:
-	@echo $<
-	@$(GCC) $(COPT) $(DEFINC) -c $< -o $@
+	@echo ">>>" $<
+	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
+.S.o:
+	@echo ">>>" $<
+	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
+
+../../Pico/carthw/svp/compiler.o : ../../Pico/carthw/svp/ssp16.o ../../Pico/carthw/svp/gen_arm.c
 
 ../../Pico/draw_asm.o : ../../Pico/Draw.s
-	@echo $<
-	@$(AS) $(ASOPT) $< -o $@
+	@echo ">>>" $<
+	$(AS) $(ASOPT) $< -o $@
 ../../Pico/draw2_asm.o : ../../Pico/Draw2.s
-	@echo $<
-	@$(AS) $(ASOPT) $< -o $@
+	@echo ">>>" $<
+	$(AS) $(ASOPT) $< -o $@
 ../../Pico/memory_asm.o : ../../Pico/Memory.s
-	@echo $<
-	@$(AS) $(ASOPT) $< -o $@
+	@echo ">>>" $<
+	$(AS) $(ASOPT) $< -o $@
 ../../Pico/sound/ym2612_asm.o : ../../Pico/sound/ym2612.s
-	@echo $<
-	@$(AS) $(ASOPT) $< -o $@
+	@echo ">>>" $<
+	$(AS) $(ASOPT) $< -o $@
 ../../Pico/sound/mix_asm.o : ../../Pico/sound/mix.s
-	@echo $<
-	@$(AS) $(ASOPT) $< -o $@
-../../Pico/misc_asm.o : ../../Pico/misc.s
-	@echo $<
-	@$(AS) $(ASOPT) $< -o $@
+	@echo ">>>" $<
+	$(AS) $(ASOPT) $< -o $@
+../../Pico/misc_asm.o : ../../Pico/Misc.s
+	@echo ">>>" $<
+	$(AS) $(ASOPT) $< -o $@
 ../../Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s
-	@echo $<
-	@$(AS) $(ASOPT) $< -o $@
+	@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 $@
+	@echo ">>>" $<
+	$(AS) $(ASOPT) $< -o $@
+../../Pico/cd/misc_asm.o : ../../Pico/cd/Misc.s
+	@echo ">>>" $<
+	$(AS) $(ASOPT) $< -o $@
 
 # build Cyclone
 ../../cpu/Cyclone/proj/Cyclone.s :
@@ -196,17 +203,25 @@ testrefr.gpe : test.o gp2x.o asmutils.o
 ../../cpu/musashi/m68kops.c :
 	@make -C ../../cpu/musashi
 
+../../Pico/Pico.o : ../../Pico/PicoFrameHints.c ../../Pico/PicoInt.h
+../../Pico/Memory.o Pico/cd/Memory.o : ../../Pico/MemoryCmn.c ../../Pico/PicoInt.h
 
 # build helix libs
-helix/helix_mp3.a:
-	make -C helix
+../common/helix/helix_mp3.a:
+	make -C ../common/helix
+
+readme.txt: ../../tools/textfilter ../base_readme.txt
+	../../tools/textfilter ../base_readme.txt $@ GP2X
+
+../../tools/textfilter: ../../tools/textfilter.c
+	make -C ../../tools/ textfilter
 
 
 # cleanup
 clean: tidy
-	@$(RM) PicoDrive.gpe
+	$(RM) PicoDrive.gpe
 tidy:
-	@$(RM) $(OBJS)
+	$(RM) $(OBJS)
 #	@make -C ../../cpu/Cyclone/proj -f Makefile.linux clean
 
 
@@ -221,9 +236,13 @@ $(error need VER)
 endif
 endif
 
-rel: PicoDrive.gpe code940/pico940.bin ../readme.txt config.txt PicoDrive.man.txt PicoDrive.png
+rel: PicoDrive.gpe code940/pico940_v2.bin readme.txt PicoDrive.man.txt PicoDrive.png ../game_def.cfg
 	zip -9 -j ../../PicoDrive_$(VER).zip $^ mmuhack.o
 	zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt
+	mkdir bin_to_cso_mp3
+	cp ../../tools/bin_to_cso_mp3/* bin_to_cso_mp3/
+	zip -9 -r ../../PicoDrive_$(VER).zip bin_to_cso_mp3
+	rm -rf bin_to_cso_mp3
 
 code940/code940.bin:
 	make -C code940/