X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2FMakefile;h=06761a30b89779f0bae390d9ce5060c4cd857201;hb=02ba8788a0a15cd76fefc777908738cc27e78e6c;hp=0fd9feb99b27d435b108ce55e1d7d54d9e640c67;hpb=8187ba84b7ed56e2535a8381ac66fb5b32414b39;p=picodrive.git

diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index 0fd9feb..06761a3 100644
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -44,16 +44,17 @@ endif
 ifeq "$(profile)" "2"
 COPT_COMMON += -fprofile-use
 endif
-COPT = $(COPT_COMMON) -mtune=arm920t
-ASOPT = -mcpu=arm920t -mfloat-abi=soft
-GCC = $(CROSS)gcc
+CFLAGS = $(COPT_COMMON) -mcpu=arm920t -mtune=arm920t
+SFLAGS = $(CFLAGS)
+ASFLAGS = -mcpu=arm920t -mfloat-abi=soft
+CC = $(CROSS)gcc
 STRIP = $(CROSS)strip
 AS = $(CROSS)as
 LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy
 
 # frontend
-OBJS += main.o menu.o gp2x.o usbjoy.o emu.o squidgehack.o cpuctrl.o
+OBJS += main.o menu.o gp2x.o usbjoy.o emu.o squidgehack.o cpuctrl.o asm_utils.o
 # 940 core control
 OBJS += 940ctl.o
 
@@ -66,7 +67,7 @@ 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/VideoPort.o Pico/Draw2.o Pico/Draw.o Pico/Patch.o Pico/Debug.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 \
@@ -118,7 +119,7 @@ OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \
 OBJS += unzip/unzip.o unzip/unzip_stream.o
 # debug
 ifeq "$(debug_cyclone)" "1"
-OBJS += Pico/Debug.o cpu/musashi/m68kdasm.o
+OBJS += Pico/DebugCPU.o cpu/musashi/m68kdasm.o
 endif
 # CPU cores
 ifeq "$(use_musashi)" "1"
@@ -147,9 +148,9 @@ DIRS = platform platform/gp2x platform/common Pico Pico/cd Pico/Pico Pico/sound
 
 all: mkdirs PicoDrive.gpe
 
-PicoDrive.gpe : $(OBJS) ../common/helix/helix_mp3.a
+PicoDrive.gpe : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a
 	@echo ">>>" $@
-	$(GCC) -o $@ $(COPT) $^ -lm -lpng -Wl,-Map=PicoDrive.map
+	$(CC) -o $@ $(CFLAGS) $^ -lm -lpng -Wl,-Map=PicoDrive.map
 ifeq ($(DEBUG),)
 	$(STRIP) $@
 endif
@@ -164,79 +165,14 @@ clean: tidy
 	$(RM) PicoDrive.gpe
 tidy:
 	$(RM) $(OBJS)
-	rm -rf $(DIRS)
+#	rm -rf $(DIRS) # don't clean, gcda may be there
 #	@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 ">>>" $<
-	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
-.s.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 $@
-Pico/draw2_asm.o : ../../Pico/Draw2.s
-	@echo ">>>" $<
-	$(AS) $(ASOPT) $< -o $@
-Pico/memory_asm.o : ../../Pico/Memory.s
-	@echo ">>>" $<
-	$(AS) $(ASOPT) $< -o $@
-Pico/sound/ym2612_asm.o : ../../Pico/sound/ym2612.s
-	@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 $@
-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 CONFIG_FILE=config_pico.h
-
-../../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
-
-# build helix libs
-../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
-
+include ../common/common_arm.mak
 
 # ----------- release -----------
 ifneq ($(findstring rel,$(MAKECMDGOALS)),)
@@ -245,7 +181,7 @@ $(error need VER)
 endif
 endif
 
-rel: PicoDrive.gpe code940/pico940_v2.bin readme.txt PicoDrive.man.txt PicoDrive.png ../game_def.cfg
+rel: PicoDrive.gpe code940/pico940_v3.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