X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2FMakefile;h=0fd9feb99b27d435b108ce55e1d7d54d9e640c67;hb=ac3494f42e030f50c5fe1fa35de684c2c3055af4;hp=d9beac8162b221a68279aa8ce0930ce6df94d6fd;hpb=8a091e48251d061ad06ffd12dfe205cbb42c78df;p=libpicofe.git

diff --git a/gp2x/Makefile b/gp2x/Makefile
index d9beac8..0fd9feb 100644
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -58,89 +58,94 @@ OBJS += main.o menu.o gp2x.o usbjoy.o emu.o squidgehack.o cpuctrl.o
 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
+OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \
+	platform/common/arm_utils.o platform/common/readpng.o platform/common/mp3_helix.o
 
 # Pico
 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
+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/cue.o ../../Pico/cd/gfx_cd.o \
-		../../Pico/cd/Area.o ../../Pico/cd/Misc.o ../../Pico/cd/pcm.o ../../Pico/cd/buffering.o
+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/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
+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
+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"
 DEFINC += -D_ASM_DRAW_C
-OBJS += ../../Pico/draw_asm.o ../../Pico/draw2_asm.o
+OBJS += Pico/draw_asm.o Pico/draw2_asm.o
 endif
 ifeq "$(asm_memory)" "1"
 DEFINC += -D_ASM_MEMORY_C
-OBJS += ../../Pico/memory_asm.o
+OBJS += Pico/memory_asm.o
 endif
 ifeq "$(asm_ym2612)" "1"
 DEFINC += -D_ASM_YM2612_C
-OBJS += ../../Pico/sound/ym2612_asm.o
+OBJS += Pico/sound/ym2612_asm.o
 endif
 ifeq "$(asm_misc)" "1"
 DEFINC += -D_ASM_MISC_C
-OBJS += ../../Pico/misc_asm.o
-OBJS += ../../Pico/cd/misc_asm.o
+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
+OBJS += Pico/cd/pico_asm.o
 endif
 ifeq "$(asm_cdmemory)" "1"
 DEFINC += -D_ASM_CD_MEMORY_C
-OBJS += ../../Pico/cd/memory_asm.o
+OBJS += Pico/cd/memory_asm.o
 endif
 
 # Pico - sound
 ifneq "$(amalgamate)" "1"
-OBJS += ../../Pico/sound/sound.o
+OBJS += Pico/sound/sound.o
 endif
-OBJS += ../../Pico/sound/mix_asm.o
-OBJS += ../../Pico/sound/sn76496.o ../../Pico/sound/ym2612.o
+OBJS += Pico/sound/mix_asm.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
+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
 # unzip
-OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o
+OBJS += unzip/unzip.o unzip/unzip_stream.o
 # debug
 ifeq "$(debug_cyclone)" "1"
-OBJS += ../../Pico/Debug.o ../../cpu/musashi/m68kdasm.o
+OBJS += Pico/Debug.o cpu/musashi/m68kdasm.o
 endif
 # CPU cores
 ifeq "$(use_musashi)" "1"
 DEFINC += -DEMU_M68K
-OBJS += ../../cpu/musashi/m68kops.o ../../cpu/musashi/m68kcpu.o
+OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o
 endif
 ifeq "$(use_cyclone)" "1"
 DEFINC += -DEMU_C68K
-OBJS += ../../cpu/Cyclone/proj/Cyclone.o ../../cpu/Cyclone/tools/idle.o
+OBJS += cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o
 endif
 # drz80/mz80
 ifeq "$(mz80)" "1"
 DEFINC += -D_USE_MZ80
-OBJS += ../../cpu/mz80/mz80.o
+OBJS += cpu/mz80/mz80.o
 else
 DEFINC += -D_USE_DRZ80
-OBJS += ../../cpu/DrZ80/drz80.o
+OBJS += cpu/DrZ80/drz80.o
 endif
 
+vpath %.c = ../..
+vpath %.s = ../..
+vpath %.S = ../..
+DIRS = platform platform/gp2x platform/common Pico Pico/cd Pico/Pico Pico/sound Pico/carthw/svp \
+	zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80
 
-all: PicoDrive.gpe
+
+all: mkdirs PicoDrive.gpe
 
 PicoDrive.gpe : $(OBJS) ../common/helix/helix_mp3.a
 	@echo ">>>" $@
@@ -154,6 +159,22 @@ up: PicoDrive.gpe
 
 #	@cmd //C copy PicoDrive.gpe \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\
 
+# cleanup
+clean: tidy
+	$(RM) PicoDrive.gpe
+tidy:
+	$(RM) $(OBJS)
+	rm -rf $(DIRS)
+#	@make -C ../../cpu/Cyclone/proj -f Makefile.linux clean
+
+
+clean_prof:
+	find ../.. -name '*.gcno' -delete
+	find ../.. -name '*.gcda' -delete
+
+
+mkdirs:
+	mkdir -p $(DIRS)
 
 .c.o:
 	@echo ">>>" $<
@@ -165,33 +186,33 @@ up: PicoDrive.gpe
 	@echo ">>>" $<
 	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
 
-../../Pico/carthw/svp/compiler.o : ../../Pico/carthw/svp/ssp16.o ../../Pico/carthw/svp/gen_arm.c
+Pico/carthw/svp/compiler.o : ../../Pico/carthw/svp/ssp16.o ../../Pico/carthw/svp/gen_arm.c
 
-../../Pico/draw_asm.o : ../../Pico/Draw.s
+Pico/draw_asm.o : ../../Pico/Draw.s
 	@echo ">>>" $<
 	$(AS) $(ASOPT) $< -o $@
-../../Pico/draw2_asm.o : ../../Pico/Draw2.s
+Pico/draw2_asm.o : ../../Pico/Draw2.s
 	@echo ">>>" $<
 	$(AS) $(ASOPT) $< -o $@
-../../Pico/memory_asm.o : ../../Pico/Memory.s
+Pico/memory_asm.o : ../../Pico/Memory.s
 	@echo ">>>" $<
 	$(AS) $(ASOPT) $< -o $@
-../../Pico/sound/ym2612_asm.o : ../../Pico/sound/ym2612.s
+Pico/sound/ym2612_asm.o : ../../Pico/sound/ym2612.s
 	@echo ">>>" $<
 	$(AS) $(ASOPT) $< -o $@
-../../Pico/sound/mix_asm.o : ../../Pico/sound/mix.s
+Pico/sound/mix_asm.o : ../../Pico/sound/mix.s
 	@echo ">>>" $<
 	$(AS) $(ASOPT) $< -o $@
-../../Pico/misc_asm.o : ../../Pico/Misc.s
+Pico/misc_asm.o : ../../Pico/Misc.s
 	@echo ">>>" $<
 	$(AS) $(ASOPT) $< -o $@
-../../Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s
+Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s
 	@echo ">>>" $<
 	$(AS) $(ASOPT) $< -o $@
-../../Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s
+Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s
 	@echo ">>>" $<
 	$(AS) $(ASOPT) $< -o $@
-../../Pico/cd/misc_asm.o : ../../Pico/cd/Misc.s
+Pico/cd/misc_asm.o : ../../Pico/cd/Misc.s
 	@echo ">>>" $<
 	$(AS) $(ASOPT) $< -o $@
 
@@ -203,8 +224,8 @@ up: PicoDrive.gpe
 ../../cpu/musashi/m68kops.c :
 	@make -C ../../cpu/musashi
 
-../../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
+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:
@@ -217,18 +238,6 @@ readme.txt: ../../tools/textfilter ../base_readme.txt
 	make -C ../../tools/ textfilter
 
 
-# cleanup
-clean: tidy
-	$(RM) PicoDrive.gpe
-tidy:
-	$(RM) $(OBJS)
-#	@make -C ../../cpu/Cyclone/proj -f Makefile.linux clean
-
-
-clean_prof:
-	find ../.. -name '*.gcno' -delete
-	find ../.. -name '*.gcda' -delete
-
 # ----------- release -----------
 ifneq ($(findstring rel,$(MAKECMDGOALS)),)
 ifeq ($(VER),)