notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new z80 scheduling method, timers are still wip
[picodrive.git]
/
platform
/
gp2x
/
Makefile
diff --git
a/platform/gp2x/Makefile
b/platform/gp2x/Makefile
index
5c903b1
..
4ebecb4
100644
(file)
--- a/
platform/gp2x/Makefile
+++ b/
platform/gp2x/Makefile
@@
-31,10
+31,10
@@
else
use_cyclone = 1
\r
endif
\r
\r
use_cyclone = 1
\r
endif
\r
\r
-DEFINC = -I../.. -I. -DARM -D__GP2X__
-D_UNZIP_SUPPORT
# -DBENCHMARK
\r
+DEFINC = -I../.. -I. -DARM -D__GP2X__ # -DBENCHMARK
\r
COPT_COMMON = -static -Wall -Winline
\r
ifeq ($(DEBUG),)
\r
COPT_COMMON = -static -Wall -Winline
\r
ifeq ($(DEBUG),)
\r
-COPT_COMMON += -O
2
-ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math
\r
+COPT_COMMON += -O
3
-ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math
\r
else
\r
COPT_COMMON += -ggdb
\r
endif
\r
else
\r
COPT_COMMON += -ggdb
\r
endif
\r
@@
-58,7
+58,7
@@
OBJS += main.o menu.o gp2x.o usbjoy.o emu.o squidgehack.o cpuctrl.o
OBJS += 940ctl.o
\r
\r
# common
\r
OBJS += 940ctl.o
\r
\r
# common
\r
-OBJS += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/arm_utils.o \
\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
../common/readpng.o ../common/mp3_helix.o
\r
\r
# Pico
\r
@@
-70,9
+70,14
@@
OBJS += ../../Pico/Area.o ../../Pico/Cart.o ../../Pico/Memory.o ../../Pico/Misc.
../../Pico/Patch.o
\r
# Pico - CD
\r
OBJS += ../../Pico/cd/Pico.o ../../Pico/cd/Memory.o ../../Pico/cd/Sek.o ../../Pico/cd/LC89510.o \
\r
../../Pico/Patch.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/cd_sys.o ../../Pico/cd/cd_file.o ../../Pico/cd/
cue.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/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
\r
# asm stuff
\r
ifeq "$(asm_render)" "1"
\r
@@
-114,7
+119,7
@@
OBJS += ../../zlib/gzio.o ../../zlib/inffast.o ../../zlib/inflate.o ../../zlib/i
OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o
\r
# debug
\r
ifeq "$(debug_cyclone)" "1"
\r
OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o
\r
# debug
\r
ifeq "$(debug_cyclone)" "1"
\r
-OBJS += ../../Pico/
_cyclone_d
ebug.o ../../cpu/musashi/m68kdasm.o
\r
+OBJS += ../../Pico/
D
ebug.o ../../cpu/musashi/m68kdasm.o
\r
endif
\r
# CPU cores
\r
ifeq "$(use_musashi)" "1"
\r
endif
\r
# CPU cores
\r
ifeq "$(use_musashi)" "1"
\r
@@
-138,15
+143,10
@@
endif
all: PicoDrive.gpe
\r
\r
PicoDrive.gpe : $(OBJS) ../common/helix/helix_mp3.a
\r
all: PicoDrive.gpe
\r
\r
PicoDrive.gpe : $(OBJS) ../common/helix/helix_mp3.a
\r
- @echo $@
\r
-
@
$(GCC) -o $@ $(COPT) $^ -lm -lpng -Wl,-Map=PicoDrive.map
\r
+ @echo
">>>"
$@
\r
+ $(GCC) -o $@ $(COPT) $^ -lm -lpng -Wl,-Map=PicoDrive.map
\r
ifeq ($(DEBUG),)
\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
endif
\r
\r
up: PicoDrive.gpe
\r
@@
-155,45
+155,45
@@
up: PicoDrive.gpe
# @cmd //C copy PicoDrive.gpe \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\
\r
\r
\r
# @cmd //C copy PicoDrive.gpe \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\
\r
\r
\r
-testrefr.gpe : test.o gp2x.o
\r
- @echo $@
\r
- @$(GCC) $(COPT) $^ -o $@
\r
- @$(STRIP) $@
\r
-
\r
.c.o:
\r
.c.o:
\r
- @echo $<
\r
-
@
$(GCC) $(COPT) $(DEFINC) -c $< -o $@
\r
+ @echo
">>>"
$<
\r
+ $(GCC) $(COPT) $(DEFINC) -c $< -o $@
\r
.s.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
\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
../../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
../../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
../../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
../../Pico/sound/mix_asm.o : ../../Pico/sound/mix.s
\r
- @echo $<
\r
-
@
$(AS) $(ASOPT) $< -o $@
\r
+ @echo
">>>"
$<
\r
+ $(AS) $(ASOPT) $< -o $@
\r
../../Pico/misc_asm.o : ../../Pico/Misc.s
\r
../../Pico/misc_asm.o : ../../Pico/Misc.s
\r
- @echo $<
\r
-
@
$(AS) $(ASOPT) $< -o $@
\r
+ @echo
">>>"
$<
\r
+ $(AS) $(ASOPT) $< -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) $(ASOPT) $< -o $@
\r
+ @echo
">>>"
$<
\r
+ $(AS) $(ASOPT) $< -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) $(ASOPT) $< -o $@
\r
+ @echo
">>>"
$<
\r
+ $(AS) $(ASOPT) $< -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) $(ASOPT) $< -o $@
\r
+ @echo
">>>"
$<
\r
+ $(AS) $(ASOPT) $< -o $@
\r
\r
# build Cyclone
\r
../../cpu/Cyclone/proj/Cyclone.s :
\r
\r
# build Cyclone
\r
../../cpu/Cyclone/proj/Cyclone.s :
\r
@@
-203,17
+203,25
@@
testrefr.gpe : test.o gp2x.o
../../cpu/musashi/m68kops.c :
\r
@make -C ../../cpu/musashi
\r
\r
../../cpu/musashi/m68kops.c :
\r
@make -C ../../cpu/musashi
\r
\r
+../../Pico/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
\r
\r
# build helix libs
\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
\r
# cleanup
\r
clean: tidy
\r
-
@
$(RM) PicoDrive.gpe
\r
+ $(RM) PicoDrive.gpe
\r
tidy:
\r
tidy:
\r
-
@
$(RM) $(OBJS)
\r
+ $(RM) $(OBJS)
\r
# @make -C ../../cpu/Cyclone/proj -f Makefile.linux clean
\r
\r
\r
# @make -C ../../cpu/Cyclone/proj -f Makefile.linux clean
\r
\r
\r
@@
-228,9
+236,13
@@
$(error need VER)
endif
\r
endif
\r
\r
endif
\r
endif
\r
\r
-rel: PicoDrive.gpe code940/pico940
.bin ../readme.txt config.txt PicoDrive.man.txt PicoDrive.pn
g
\r
+rel: PicoDrive.gpe code940/pico940
_v2.bin readme.txt PicoDrive.man.txt PicoDrive.png ../game_def.cf
g
\r
zip -9 -j ../../PicoDrive_$(VER).zip $^ mmuhack.o
\r
zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt
\r
zip -9 -j ../../PicoDrive_$(VER).zip $^ mmuhack.o
\r
zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt
\r
+ mkdir bin_to_cso_mp3
\r
+ cp ../../tools/bin_to_cso_mp3/* bin_to_cso_mp3/
\r
+ zip -9 -r ../../PicoDrive_$(VER).zip bin_to_cso_mp3
\r
+ rm -rf bin_to_cso_mp3
\r
\r
code940/code940.bin:
\r
make -C code940/
\r
\r
code940/code940.bin:
\r
make -C code940/
\r