notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some fixes and adjustments
[picodrive.git]
/
platform
/
gp2x
/
Makefile
diff --git
a/platform/gp2x/Makefile
b/platform/gp2x/Makefile
index
0e2ffe4
..
e96126d
100644
(file)
--- a/
platform/gp2x/Makefile
+++ b/
platform/gp2x/Makefile
@@
-34,7
+34,7
@@
endif
DEFINC = -I../.. -I. -DARM -D__GP2X__ # -DBENCHMARK
\r
COPT_COMMON = -static -Wall -Winline
\r
ifeq ($(DEBUG),)
\r
DEFINC = -I../.. -I. -DARM -D__GP2X__ # -DBENCHMARK
\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
@@
-73,6
+73,9
@@
OBJS += ../../Pico/cd/Pico.o ../../Pico/cd/Memory.o ../../Pico/cd/Sek.o ../../Pi
../../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/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
\r
# asm stuff
\r
ifeq "$(asm_render)" "1"
\r
@@
-138,15
+141,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
+153,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
@@
-217,9
+215,9
@@
readme.txt: ../../tools/textfilter ../base_readme.txt
\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
@@
-234,7
+232,7
@@
$(error need VER)
endif
\r
endif
\r
\r
endif
\r
endif
\r
\r
-rel: PicoDrive.gpe code940/pico940.bin readme.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
zip -9 -j ../../PicoDrive_$(VER).zip $^ mmuhack.o
\r
zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt
\r
\r