notaz.gp2x.de
/
libpicofe.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.40a fixes
[libpicofe.git]
/
gp2x
/
Makefile
diff --git
a/gp2x/Makefile
b/gp2x/Makefile
index
5121d90
..
beace62
100644
(file)
--- a/
gp2x/Makefile
+++ b/
gp2x/Makefile
@@
-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
@@
-74,7
+74,8
@@
OBJS += ../../Pico/cd/Pico.o ../../Pico/cd/Memory.o ../../Pico/cd/Sek.o ../../Pi
../../Pico/cd/Area.o ../../Pico/cd/Misc.o ../../Pico/cd/pcm.o ../../Pico/cd/buffering.o
\r
endif
\r
# Pico - carthw
\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/svp/svp.o ../../Pico/carthw/svp/Memory.o ../../Pico/carthw/svp/ssp16.o
\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
@@
-158,6
+159,11
@@
up: PicoDrive.gpe
.s.o:
\r
@echo ">>>" $<
\r
$(GCC) $(COPT) $(DEFINC) -c $< -o $@
\r
.s.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
\r
../../Pico/draw_asm.o : ../../Pico/Draw.s
\r
@echo ">>>" $<
\r
@@
-226,7
+232,7
@@
$(error need VER)
endif
\r
endif
\r
\r
endif
\r
endif
\r
\r
-rel: PicoDrive.gpe code940/pico940_v2.bin readme.txt PicoDrive.man.txt PicoDrive.png
\r
+rel: PicoDrive.gpe code940/pico940_v2.bin readme.txt PicoDrive.man.txt PicoDrive.png
game_def.cfg
\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