\r
# you may or may not need to change this\r
#devkit_path = x:/stuff/dev/devkitgp2x/\r
-CROSS = arm-linux-\r
+export CROSS = arm-linux-\r
#CROSS = $(devkit_path)bin/arm-linux-\r
\r
# settings\r
asm_misc = 1\r
asm_cdpico = 1\r
asm_cdmemory = 1\r
-amalgamate = 1\r
+amalgamate = 0\r
#profile = 1\r
#use_musashi = 1\r
#up = 1\r
use_cyclone = 1\r
endif\r
\r
-DEFINC = -I../.. -I. -DARM -D__GP2X__ -D_UNZIP_SUPPORT # -DBENCHMARK\r
-COPT_COMMON = -static -Wall -O3 -ftracer -fstrength-reduce -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math # -s\r
+DEFINC = -I../.. -I. -DARM -D__GP2X__ # -DBENCHMARK\r
+COPT_COMMON = -static -Wall -Winline\r
+ifeq ($(DEBUG),)\r
+COPT_COMMON += -O3 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
+else\r
+COPT_COMMON += -ggdb\r
+endif\r
ifeq "$(profile)" "1"\r
COPT_COMMON += -fprofile-generate\r
endif\r
OBJCOPY = $(CROSS)objcopy\r
\r
# frontend\r
-OBJS += main.o menu.o fonts.o gp2x.o usbjoy.o emu.o squidgehack.o asmutils.o cpuctrl.o readpng.o\r
+OBJS += main.o menu.o gp2x.o usbjoy.o emu.o squidgehack.o cpuctrl.o\r
# 940 core control\r
OBJS += 940ctl.o\r
\r
+# common\r
+OBJS += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/config.o ../common/arm_utils.o \\r
+ ../common/readpng.o ../common/mp3_helix.o\r
+\r
# Pico\r
ifeq "$(amalgamate)" "1"\r
OBJS += ../../PicoAll.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
endif\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
../../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
-# mp3\r
-OBJS += mp3.o\r
# debug\r
ifeq "$(debug_cyclone)" "1"\r
OBJS += ../../Pico/_cyclone_debug.o ../../cpu/musashi/m68kdasm.o\r
\r
all: PicoDrive.gpe\r
\r
-PicoDrive.gpe : $(OBJS) helix/helix_mp3.a\r
- @echo $@\r
- @$(GCC) -o $@ $(COPT) $^ -lm -lpng -Wl,-Map=PicoDrive.map\r
+PicoDrive.gpe : $(OBJS) ../common/helix/helix_mp3.a\r
+ @echo ">>>" $@\r
+ $(GCC) -o $@ $(COPT) $^ -lm -lpng -Wl,-Map=PicoDrive.map\r
ifeq ($(DEBUG),)\r
- @$(STRIP) $@\r
-endif\r
-# @$(GCC) $(COPT) $(OBJS) -lm -o PicoDrive_.gpe\r
-# @gpecomp PicoDrive_.gpe $@\r
-ifeq "$(up)" "1"\r
- @cmd //C copy $@ \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\\r
+ $(STRIP) $@\r
endif\r
\r
up: PicoDrive.gpe\r
# @cmd //C copy PicoDrive.gpe \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\\r
\r
\r
-testrefr.gpe : test.o gp2x.o asmutils.o\r
- @echo $@\r
- @$(GCC) $(COPT) $^ -o $@\r
- @$(STRIP) $@\r
-\r
.c.o:\r
- @echo $<\r
- @$(GCC) $(COPT) $(DEFINC) -c $< -o $@\r
+ @echo ">>>" $<\r
+ $(GCC) $(COPT) $(DEFINC) -c $< -o $@\r
.s.o:\r
- @echo $<\r
- @$(GCC) $(COPT) $(DEFINC) -c $< -o $@\r
+ @echo ">>>" $<\r
+ $(GCC) $(COPT) $(DEFINC) -c $< -o $@\r
+.S.o:\r
+ @echo ">>>" $<\r
+ $(GCC) $(COPT) $(DEFINC) -c $< -o $@\r
+\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) $(ASOPT) $< -o $@\r
+ @echo ">>>" $<\r
+ $(AS) $(ASOPT) $< -o $@\r
../../Pico/draw2_asm.o : ../../Pico/Draw2.s\r
- @echo $<\r
- @$(AS) $(ASOPT) $< -o $@\r
+ @echo ">>>" $<\r
+ $(AS) $(ASOPT) $< -o $@\r
../../Pico/memory_asm.o : ../../Pico/Memory.s\r
- @echo $<\r
- @$(AS) $(ASOPT) $< -o $@\r
+ @echo ">>>" $<\r
+ $(AS) $(ASOPT) $< -o $@\r
../../Pico/sound/ym2612_asm.o : ../../Pico/sound/ym2612.s\r
- @echo $<\r
- @$(AS) $(ASOPT) $< -o $@\r
+ @echo ">>>" $<\r
+ $(AS) $(ASOPT) $< -o $@\r
../../Pico/sound/mix_asm.o : ../../Pico/sound/mix.s\r
- @echo $<\r
- @$(AS) $(ASOPT) $< -o $@\r
-../../Pico/misc_asm.o : ../../Pico/misc.s\r
- @echo $<\r
- @$(AS) $(ASOPT) $< -o $@\r
+ @echo ">>>" $<\r
+ $(AS) $(ASOPT) $< -o $@\r
+../../Pico/misc_asm.o : ../../Pico/Misc.s\r
+ @echo ">>>" $<\r
+ $(AS) $(ASOPT) $< -o $@\r
../../Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s\r
- @echo $<\r
- @$(AS) $(ASOPT) $< -o $@\r
+ @echo ">>>" $<\r
+ $(AS) $(ASOPT) $< -o $@\r
../../Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s\r
- @echo $<\r
- @$(AS) $(ASOPT) $< -o $@\r
-../../Pico/cd/misc_asm.o : ../../Pico/cd/misc.s\r
- @echo $<\r
- @$(AS) $(ASOPT) $< -o $@\r
+ @echo ">>>" $<\r
+ $(AS) $(ASOPT) $< -o $@\r
+../../Pico/cd/misc_asm.o : ../../Pico/cd/Misc.s\r
+ @echo ">>>" $<\r
+ $(AS) $(ASOPT) $< -o $@\r
\r
# build Cyclone\r
../../cpu/Cyclone/proj/Cyclone.s :\r
\r
\r
# build helix libs\r
-helix/helix_mp3.a:\r
- make -C helix\r
+../common/helix/helix_mp3.a:\r
+ make -C ../common/helix\r
+\r
+readme.txt: ../../tools/textfilter ../base_readme.txt\r
+ ../../tools/textfilter ../base_readme.txt $@ GP2X\r
+\r
+../../tools/textfilter: ../../tools/textfilter.c\r
+ make -C ../../tools/ textfilter\r
\r
\r
# cleanup\r
clean: tidy\r
- @$(RM) PicoDrive.gpe\r
+ $(RM) PicoDrive.gpe\r
tidy:\r
- @$(RM) $(OBJS)\r
+ $(RM) $(OBJS)\r
# @make -C ../../cpu/Cyclone/proj -f Makefile.linux clean\r
\r
\r
endif\r
endif\r
\r
-rel: PicoDrive.gpe code940/pico940.bin ../readme.txt config.txt PicoDrive.man.txt PicoDrive.png\r
+rel: PicoDrive.gpe code940/pico940_v2.bin readme.txt PicoDrive.man.txt PicoDrive.png\r
zip -9 -j ../../PicoDrive_$(VER).zip $^ mmuhack.o\r
zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt\r
\r