\r
# you may or may not need to change this\r
-export CROSS = /opt/cegcc/arm-wince-cegcc/bin/\r
+export CROSS = arm-wince-cegcc-\r
\r
# settings\r
asm_memory = 1\r
ifeq "$(profile)" "2"\r
COPT_COMMON += -fprofile-use\r
endif\r
-COPT = $(COPT_COMMON) -mtune=arm920t\r
+CFLAGS = $(COPT_COMMON) -mcpu=arm920t -mtune=arm920t\r
ASFLAGS = -mcpu=arm920t -mfloat-abi=soft\r
GCC = $(CROSS)gcc\r
STRIP = $(CROSS)strip\r
OBJS += main.o emu.o menu.o giz.o asm_utils.o\r
\r
# common\r
-OBJS += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/arm_utils.o \\r
- ../common/readpng.o ../common/mp3_helix.o\r
+OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \\r
+ platform/common/arm_utils.o platform/common/readpng.o platform/common/mp3_helix.o\r
\r
# Pico\r
ifeq "$(amalgamate)" "1"\r
-OBJS += ../../PicoAll.o\r
+OBJS += PicoAll.o\r
else\r
-OBJS += ../../Pico/Area.o ../../Pico/Cart.o ../../Pico/Memory.o ../../Pico/Misc.o \\r
- ../../Pico/Pico.o ../../Pico/Sek.o ../../Pico/VideoPort.o ../../Pico/Draw2.o ../../Pico/Draw.o \\r
- ../../Pico/Patch.o\r
+OBJS += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.o Pico/Pico.o Pico/Sek.o \\r
+ Pico/VideoPort.o Pico/Draw2.o Pico/Draw.o Pico/Patch.o Pico/Debug.o\r
# Pico - CD\r
-OBJS += ../../Pico/cd/Pico.o ../../Pico/cd/Memory.o ../../Pico/cd/Sek.o ../../Pico/cd/LC89510.o \\r
- ../../Pico/cd/cd_sys.o ../../Pico/cd/cd_file.o ../../Pico/cd/gfx_cd.o \\r
- ../../Pico/cd/Area.o ../../Pico/cd/Misc.o ../../Pico/cd/pcm.o ../../Pico/cd/buffering.o\r
+OBJS += Pico/cd/Pico.o Pico/cd/Memory.o Pico/cd/Sek.o Pico/cd/LC89510.o \\r
+ Pico/cd/cd_sys.o Pico/cd/cd_file.o Pico/cd/gfx_cd.o Pico/cd/cue.o \\r
+ Pico/cd/Area.o Pico/cd/Misc.o Pico/cd/pcm.o Pico/cd/buffering.o\r
endif\r
+# Pico - Pico\r
+OBJS += Pico/Pico/Pico.o Pico/Pico/Memory.o Pico/Pico/xpcm.o\r
+# Pico - carthw\r
+OBJS += Pico/carthw/carthw.o Pico/carthw/svp/svp.o Pico/carthw/svp/Memory.o \\r
+ Pico/carthw/svp/ssp16.o Pico/carthw/svp/compiler.o Pico/carthw/svp/stub_arm.o\r
\r
# asm stuff\r
ifeq "$(asm_render)" "1"\r
DEFINC += -D_ASM_DRAW_C\r
-OBJS += ../../Pico/draw_asm.o ../../Pico/draw2_asm.o\r
+OBJS += Pico/draw_asm.o Pico/draw2_asm.o\r
endif\r
ifeq "$(asm_memory)" "1"\r
DEFINC += -D_ASM_MEMORY_C\r
-OBJS += ../../Pico/memory_asm.o\r
+OBJS += Pico/memory_asm.o\r
endif\r
ifeq "$(asm_ym2612)" "1"\r
DEFINC += -D_ASM_YM2612_C\r
-OBJS += ../../Pico/sound/ym2612_asm.o\r
+OBJS += Pico/sound/ym2612_asm.o\r
endif\r
ifeq "$(asm_misc)" "1"\r
DEFINC += -D_ASM_MISC_C\r
-OBJS += ../../Pico/misc_asm.o\r
-OBJS += ../../Pico/cd/misc_asm.o\r
+OBJS += Pico/misc_asm.o\r
+OBJS += Pico/cd/misc_asm.o\r
endif\r
ifeq "$(asm_cdpico)" "1"\r
DEFINC += -D_ASM_CD_PICO_C\r
-OBJS += ../../Pico/cd/pico_asm.o\r
+OBJS += Pico/cd/pico_asm.o\r
endif\r
ifeq "$(asm_cdmemory)" "1"\r
DEFINC += -D_ASM_CD_MEMORY_C\r
-OBJS += ../../Pico/cd/memory_asm.o\r
+OBJS += Pico/cd/memory_asm.o\r
endif\r
\r
# Pico - sound\r
ifneq "$(amalgamate)" "1"\r
-OBJS += ../../Pico/sound/sound.o\r
+OBJS += Pico/sound/sound.o\r
endif\r
-OBJS += ../../Pico/sound/mix_asm.o\r
-OBJS += ../../Pico/sound/sn76496.o ../../Pico/sound/ym2612.o\r
+OBJS += Pico/sound/mix_asm.o\r
+OBJS += Pico/sound/sn76496.o Pico/sound/ym2612.o\r
# zlib\r
-OBJS += ../../zlib/gzio.o ../../zlib/inffast.o ../../zlib/inflate.o ../../zlib/inftrees.o ../../zlib/trees.o \\r
- ../../zlib/deflate.o ../../zlib/crc32.o ../../zlib/adler32.o ../../zlib/zutil.o ../../zlib/compress.o\r
+OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \\r
+ zlib/deflate.o zlib/crc32.o zlib/adler32.o zlib/zutil.o zlib/compress.o\r
# unzip\r
-OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o\r
+OBJS += unzip/unzip.o unzip/unzip_stream.o\r
# CPU cores\r
# Cyclone\r
DEFINC += -DEMU_C68K\r
-OBJS += ../../cpu/Cyclone/proj/Cyclone.o\r
+OBJS += cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o\r
# drz80\r
DEFINC += -D_USE_DRZ80\r
-OBJS += ../../cpu/DrZ80/drz80.o\r
+OBJS += cpu/DrZ80/drz80.o\r
\r
+vpath %.c = ../..\r
+vpath %.s = ../..\r
+vpath %.S = ../..\r
+DIRS = platform platform/common Pico Pico/cd Pico/Pico Pico/sound Pico/carthw/svp \\r
+ zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80\r
\r
-all: PicoDrive.exe readme.txt\r
\r
-PicoDrive.exe : $(OBJS) ../common/helix/helix_mp3.a\r
+all: mkdirs PicoDrive.exe readme.txt\r
+\r
+PicoDrive.exe : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a\r
@echo ">>>" $@\r
- $(GCC) -o $@ -static $(COPT) $^ -lm -lpng -Lkgsdk/ -lKGSDK -Wl,-Map=PicoDrive.map 2>&1 | \\r
- grep -v ".idata$$4" # | grep -v "supports interworking, whereas"\r
+ $(GCC) -o $@ -static $(CFLAGS) $^ -lm -lpng -Lkgsdk/ -lKGSDK -Wl,-Map=PicoDrive.map \\r
+ 2>&1 | grep -v ".idata$$4" # | grep -v "supports interworking, whereas"\r
ifeq ($(DEBUG),)\r
$(STRIP) $@\r
endif\r
+ifeq "$(profile)" "1"\r
+ ../../tools/gcda $@\r
+endif\r
\r
\r
.c.o:\r
@echo ">>>" $<\r
- $(GCC) $(COPT) $(DEFINC) -c $< -o $@\r
+ $(GCC) $(CFLAGS) $(DEFINC) -c $< -o $@\r
#.s.o:\r
# @echo $<\r
-# $(GCC) $(COPT) $(DEFINC) -c $< -o $@\r
+# $(GCC) $(CFLAGS) $(DEFINC) -c $< -o $@\r
+\r
+mkdirs:\r
+ mkdir -p $(DIRS)\r
\r
-../../Pico/draw_asm.o : ../../Pico/Draw.s\r
+Pico/carthw/svp/compiler.o : ../../Pico/carthw/svp/ssp16.o ../../Pico/carthw/svp/gen_arm.c\r
+\r
+Pico/draw_asm.o : ../../Pico/Draw.s\r
@echo ">>>" $@\r
@$(AS) $(ASFLAGS) $< -o $@\r
-../../Pico/draw2_asm.o : ../../Pico/Draw2.s\r
+Pico/draw2_asm.o : ../../Pico/Draw2.s\r
@echo ">>>" $@\r
@$(AS) $(ASFLAGS) $< -o $@\r
-../../Pico/memory_asm.o : ../../Pico/Memory.s\r
+Pico/memory_asm.o : ../../Pico/Memory.s\r
@echo ">>>" $@\r
@$(AS) $(ASFLAGS) $< -o $@\r
-../../Pico/sound/ym2612_asm.o : ../../Pico/sound/ym2612.s\r
+Pico/sound/ym2612_asm.o : ../../Pico/sound/ym2612.s\r
@echo ">>>" $@\r
@$(AS) $(ASFLAGS) $< -o $@\r
-../../Pico/sound/mix_asm.o : ../../Pico/sound/mix.s\r
+Pico/sound/mix_asm.o : ../../Pico/sound/mix.s\r
@echo ">>>" $@\r
@$(AS) $(ASFLAGS) $< -o $@\r
-../../Pico/misc_asm.o : ../../Pico/Misc.s\r
+Pico/misc_asm.o : ../../Pico/Misc.s\r
@echo ">>>" $@\r
@$(AS) $(ASFLAGS) $< -o $@\r
-../../Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s\r
+Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s\r
@echo ">>>" $@\r
@$(AS) $(ASFLAGS) $< -o $@\r
-../../Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s\r
+Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s\r
@echo ">>>" $@\r
@$(AS) $(ASFLAGS) $< -o $@\r
-../../Pico/cd/misc_asm.o : ../../Pico/cd/Misc.s\r
+Pico/cd/misc_asm.o : ../../Pico/cd/Misc.s\r
@echo ">>>" $@\r
@$(AS) $(ASFLAGS) $< -o $@\r
+Pico/carthw/svp/stub_arm.o : ../../Pico/carthw/svp/stub_arm.S\r
+ @echo ">>>" $@\r
+ $(GCC) $(CFLAGS) $(DEFINC) -c $< -o $@\r
\r
# build Cyclone\r
-../../cpu/Cyclone/proj/Cyclone.s:\r
+cpu/Cyclone/proj/Cyclone.s:\r
@echo building Cyclone...\r
@make -C ../../cpu/Cyclone/proj CONFIG_FILE=config_pico.h\r
\r
+Pico/Pico.o Pico/cd/Pico.o: ../../Pico/PicoFrameHints.c ../../Pico/PicoInt.h\r
+Pico/Memory.o Pico/cd/Memory.o : ../../Pico/MemoryCmn.c ../../Pico/PicoInt.h\r
+\r
# build helix libs\r
-../common/helix/helix_mp3.a:\r
- make -C ../common/helix\r
+../common/helix/$(CROSS)helix-mp3.a:\r
+ make -C ../common/helix clean all\r
\r
readme.txt: ../../tools/textfilter ../base_readme.txt\r
../../tools/textfilter ../base_readme.txt $@ GIZ\r
endif\r
endif\r
\r
-rel: PicoDrive.exe kgsdk/ARMV4IRel/KGSDK.dll readme.txt\r
- zip -9 -j ../../PicoDrive_$(VER).zip $^\r
+rel: PicoDrive.exe kgsdk/ARMV4IRel/KGSDK.dll ../game_def.cfg readme.txt\r
+ zip -9 -j ../../PicoDrive_giz_$(VER).zip $^\r
ln -s ../gp2x/skin skin\r
- zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt\r
+ zip -9 -r ../../PicoDrive_giz_$(VER).zip skin -i \*.png -i \*.txt\r
rm skin\r
\r