X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgizmondo%2FMakefile;h=7df468d6739cde544a1fd1b5fc4861a3d9ddae11;hb=34e424aa2709dfc457d751f55cdbf5b881ae3ef4;hp=0bae95f137cd03ffb27811a104c3fd3052519321;hpb=2ec14aec8ff1068bf6265f3ae9c502bf58cfc686;p=picodrive.git

diff --git a/platform/gizmondo/Makefile b/platform/gizmondo/Makefile
index 0bae95f..7df468d 100644
--- a/platform/gizmondo/Makefile
+++ b/platform/gizmondo/Makefile
@@ -1,20 +1,19 @@
 
 # you may or may not need to change this
-CROSS = /opt/cegcc/arm-wince-cegcc/bin/
+export CROSS = arm-wince-cegcc-
 
 # settings
 asm_memory = 1
 asm_render = 1
 asm_ym2612 = 1
 asm_misc = 1
-asm_cdpico = 1
 asm_cdmemory = 1
 amalgamate = 0
 #profile = 1
 
 
 
-DEFINC = -I../.. -I. -D__GIZ__ -D_UNZIP_SUPPORT -DNO_SYNC
+DEFINC = -I../.. -I. -D__GIZ__ -DNO_SYNC
 COPT_COMMON = -Wall -Winline
 ifeq ($(DEBUG),)
 COPT_COMMON += -O2 -ftracer -fomit-frame-pointer -fstrict-aliasing -ffast-math
@@ -27,9 +26,10 @@ endif
 ifeq "$(profile)" "2"
 COPT_COMMON += -fprofile-use
 endif
-COPT = $(COPT_COMMON) -mtune=arm920t
+CFLAGS = $(COPT_COMMON) -mcpu=arm920t -mtune=arm920t
+SFLAGS = $(CFLAGS)
 ASFLAGS = -mcpu=arm920t -mfloat-abi=soft
-GCC = $(CROSS)gcc
+CC = $(CROSS)gcc
 STRIP = $(CROSS)strip
 AS = $(CROSS)as
 LD = $(CROSS)ld
@@ -38,120 +38,70 @@ LD = $(CROSS)ld
 OBJS += main.o emu.o menu.o giz.o asm_utils.o
 
 # common
-OBJS += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/arm_utils.o ../common/readpng.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
+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/z80if.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/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
-OBJS += ../../Pico/draw_asm.o ../../Pico/draw2_asm.o
-endif
-ifeq "$(asm_memory)" "1"
-DEFINC += -D_ASM_MEMORY_C
-OBJS += ../../Pico/memory_asm.o
-endif
-ifeq "$(asm_ym2612)" "1"
-DEFINC += -D_ASM_YM2612_C
-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
-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
+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/cue.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
 
 # 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
-# mp3
-OBJS += mp3.o
+OBJS += unzip/unzip.o unzip/unzip_stream.o
 # CPU cores
 # Cyclone
 DEFINC += -DEMU_C68K
-OBJS += ../../cpu/Cyclone/proj/Cyclone.o
+OBJS += cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o
 # drz80
 DEFINC += -D_USE_DRZ80
-OBJS += ../../cpu/DrZ80/drz80.o
+OBJS += cpu/DrZ80/drz80.o
+
+vpath %.c = ../..
+vpath %.s = ../..
+vpath %.S = ../..
+DIRS = platform 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.exe
+all: mkdirs PicoDrive.exe readme.txt
 
-PicoDrive.exe : $(OBJS)
+PicoDrive.exe : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a
 	@echo ">>>" $@
-	$(GCC) -o $@ -static $(COPT) $^ -lm -lpng -Lkgsdk/ -lKGSDK -Wl,-Map=PicoDrive.map
+	$(CC) -o $@ -static $(CFLAGS) $^ -lm -lpng -Lkgsdk/ -lKGSDK -Wl,-Map=PicoDrive.map \
+		2>&1 | grep -v ".idata$$4" # | grep -v "supports interworking, whereas"
 ifeq ($(DEBUG),)
 	$(STRIP) $@
 endif
+ifeq "$(profile)" "1"
+	../../tools/gcda $@
+endif
 
 
-.c.o:
-	@echo ">>>" $<
-	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
-#.s.o:
-#	@echo $<
-#	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
-
-../../Pico/draw_asm.o : ../../Pico/Draw.s
-	@echo $<
-	@$(AS) $(ASFLAGS) $< -o $@
-../../Pico/draw2_asm.o : ../../Pico/Draw2.s
-	@echo $<
-	@$(AS) $(ASFLAGS) $< -o $@
-../../Pico/memory_asm.o : ../../Pico/Memory.s
-	@echo $<
-	@$(AS) $(ASFLAGS) $< -o $@
-../../Pico/sound/ym2612_asm.o : ../../Pico/sound/ym2612.s
-	@echo $<
-	@$(AS) $(ASFLAGS) $< -o $@
-../../Pico/sound/mix_asm.o : ../../Pico/sound/mix.s
-	@echo $<
-	@$(AS) $(ASFLAGS) $< -o $@
-../../Pico/misc_asm.o : ../../Pico/Misc.s
-	@echo $<
-	@$(AS) $(ASFLAGS) $< -o $@
-../../Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s
-	@echo $<
-	@$(AS) $(ASFLAGS) $< -o $@
-../../Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s
-	@echo $<
-	@$(AS) $(ASFLAGS) $< -o $@
-../../Pico/cd/misc_asm.o : ../../Pico/cd/Misc.s
-	@echo $<
-	@$(AS) $(ASFLAGS) $< -o $@
-
-# build Cyclone
-../../cpu/Cyclone/proj/Cyclone.s :
-	@echo building Cyclone...
-	@make -C ../../cpu/Cyclone/proj CONFIG_FILE=config_pico.h
+readme.txt: ../../tools/textfilter ../base_readme.txt
+	../../tools/textfilter ../base_readme.txt $@ GIZ
 
+include ../common/common_arm.mak
 
 
 # cleanup
@@ -161,10 +111,6 @@ tidy:
 	@$(RM) $(OBJS)
 
 
-clean_prof:
-	find ../.. -name '*.gcno' -delete
-	find ../.. -name '*.gcda' -delete
-
 up: PicoDrive.exe
 	synce-pcp -d 3 PicoDrive.exe ":/SD Card/emus/PicoDrive/PicoDrive.exe"
 
@@ -181,9 +127,9 @@ $(error need VER)
 endif
 endif
 
-rel: PicoDrive.exe kgsdk/ARMV4IRel/KGSDK.dll # ../readme.txt config.txt
-	zip -9 -j ../../PicoDrive_$(VER).zip $^
+rel: PicoDrive.exe kgsdk/ARMV4IRel/KGSDK.dll ../game_def.cfg readme.txt
+	zip -9 -j ../../PicoDrive_giz_$(VER).zip $^
 	ln -s ../gp2x/skin skin
-	zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt
+	zip -9 -r ../../PicoDrive_giz_$(VER).zip skin -i \*.png -i \*.txt
 	rm skin