X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgizmondo%2FMakefile;h=7df468d6739cde544a1fd1b5fc4861a3d9ddae11;hb=34e424aa2709dfc457d751f55cdbf5b881ae3ef4;hp=e75c71c90830002c8329e7d8cc98d0abd841a2c0;hpb=84100c0fd5a5abb6b1e712aa1feb33388362695d;p=picodrive.git diff --git a/platform/gizmondo/Makefile b/platform/gizmondo/Makefile index e75c71c..7df468d 100644 --- a/platform/gizmondo/Makefile +++ b/platform/gizmondo/Makefile @@ -7,7 +7,6 @@ asm_memory = 1 asm_render = 1 asm_ym2612 = 1 asm_misc = 1 -asm_cdpico = 1 asm_cdmemory = 1 amalgamate = 0 #profile = 1 @@ -28,8 +27,9 @@ ifeq "$(profile)" "2" COPT_COMMON += -fprofile-use endif 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 @@ -43,54 +43,27 @@ OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o pla # 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 Pico/Debug.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/cue.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/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 +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" -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 -endif +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 @@ -107,7 +80,7 @@ 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 \ +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 @@ -115,7 +88,7 @@ all: mkdirs PicoDrive.exe readme.txt PicoDrive.exe : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a @echo ">>>" $@ - $(GCC) -o $@ -static $(CFLAGS) $^ -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) $@ @@ -125,66 +98,10 @@ ifeq "$(profile)" "1" endif -.c.o: - @echo ">>>" $< - $(GCC) $(CFLAGS) $(DEFINC) -c $< -o $@ -#.s.o: -# @echo $< -# $(GCC) $(CFLAGS) $(DEFINC) -c $< -o $@ - -mkdirs: - mkdir -p $(DIRS) - -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) $(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 $@ -Pico/carthw/svp/stub_arm.o : ../../Pico/carthw/svp/stub_arm.S - @echo ">>>" $@ - $(GCC) $(CFLAGS) $(DEFINC) -c $< -o $@ - -# build Cyclone -cpu/Cyclone/proj/Cyclone.s: - @echo building Cyclone... - @make -C ../../cpu/Cyclone/proj CONFIG_FILE=config_pico.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/$(CROSS)helix-mp3.a: - make -C ../common/helix clean all - readme.txt: ../../tools/textfilter ../base_readme.txt ../../tools/textfilter ../base_readme.txt $@ GIZ -../../tools/textfilter: ../../tools/textfilter.c - make -C ../../tools/ textfilter +include ../common/common_arm.mak # cleanup @@ -194,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"