X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2FMakefile;h=beace6267f72cb278ade80abd3211f7f6df6fb79;hb=0fb424dbee4a971fc59129fe9c80f1568f6d46c0;hp=1bb9204b0f2227f7de26c383e2a4127e38a23935;hpb=415178c86f7a48445783f8db1c140d2f11cdfc9a;p=libpicofe.git diff --git a/gp2x/Makefile b/gp2x/Makefile index 1bb9204..beace62 100644 --- 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 # common -OBJS += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/arm_utils.o \ +OBJS += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/config.o ../common/arm_utils.o \ ../common/readpng.o ../common/mp3_helix.o # Pico @@ -74,8 +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 endif # Pico - carthw -OBJS += ../../Pico/carthw/svp/svp.o ../../Pico/carthw/svp/Memory.o ../../Pico/carthw/svp/ssp16.o \ - ../../Pico/carthw/svp/compiler.o ../../Pico/carthw/svp/stub_arm.o +OBJS += ../../Pico/carthw/carthw.o ../../Pico/carthw/svp/svp.o ../../Pico/carthw/svp/Memory.o \ + ../../Pico/carthw/svp/ssp16.o ../../Pico/carthw/svp/compiler.o ../../Pico/carthw/svp/stub_arm.o # asm stuff ifeq "$(asm_render)" "1" @@ -159,6 +159,9 @@ up: PicoDrive.gpe .s.o: @echo ">>>" $< $(GCC) $(COPT) $(DEFINC) -c $< -o $@ +.S.o: + @echo ">>>" $< + $(GCC) $(COPT) $(DEFINC) -c $< -o $@ ../../Pico/carthw/svp/compiler.o : ../../Pico/carthw/svp/ssp16.o ../../Pico/carthw/svp/gen_arm.c @@ -229,7 +232,7 @@ $(error need VER) endif endif -rel: PicoDrive.gpe code940/pico940_v2.bin readme.txt PicoDrive.man.txt PicoDrive.png +rel: PicoDrive.gpe code940/pico940_v2.bin readme.txt PicoDrive.man.txt PicoDrive.png game_def.cfg zip -9 -j ../../PicoDrive_$(VER).zip $^ mmuhack.o zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt