X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2Fcode940%2FMakefile;h=6b3f5f8c9654f23d0d8d672e2e1569c3fbfcd7a4;hb=d6114368e1ee2cc4e6f0eb2785a1fce626987897;hp=57892751646d2d849049b043d8ed08d488998067;hpb=4e8a534cecffcc60e96c9fefdb821cc1a09a1eba;p=picodrive.git

diff --git a/platform/gp2x/code940/Makefile b/platform/gp2x/code940/Makefile
index 5789275..6b3f5f8 100644
--- a/platform/gp2x/code940/Makefile
+++ b/platform/gp2x/code940/Makefile
@@ -3,7 +3,7 @@
 #devkit_path = x:/stuff/dev/devkitgp2x/
 devkit_path = /usr/local/devkitPro/devkitGP2X/
 lgcc_path = $(devkit_path)lib/gcc/arm-linux/4.0.3/
-CROSS = arm-linux-
+export CROSS = arm-linux-
 #CROSS = $(devkit_path)bin/arm-linux-
 
 # settings
@@ -18,7 +18,9 @@ AS = $(CROSS)as
 LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy
 
-all: code940.bin
+BIN = pico940_v2.bin
+
+all: $(BIN)
 
 
 .c.o:
@@ -41,11 +43,11 @@ OBJS940 += uClibc/memset.o uClibc/s_floor.o uClibc/e_pow.o uClibc/e_sqrt.o uClib
 OBJS940 += uClibc/s_scalbn.o uClibc/s_copysign.o uClibc/k_sin.o uClibc/k_cos.o uClibc/s_sin.o
 OBJS940 += uClibc/e_rem_pio2.o uClibc/k_rem_pio2.o uClibc/e_log.o uClibc/wrappers.o
 
-code940.bin : code940.gpe
+$(BIN) : code940.gpe
 	@echo $@
 	@$(OBJCOPY) -O binary $< $@
 
-code940.gpe : $(OBJS940) ../helix/helix_mp3.a
+code940.gpe : $(OBJS940) ../../common/helix/helix_mp3.a
 	@echo $@
 	@$(LD) -static -e code940 -Ttext 0x0 $^ -L$(lgcc_path) -lgcc -o $@ -Map code940.map
 
@@ -56,16 +58,16 @@ code940.gpe : $(OBJS940) ../helix/helix_mp3.a
 mix.o : ../../../Pico/sound/mix.s
 	@echo $@
 	@$(GCC) $(COPT) $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@
-misc.o : ../../../Pico/misc.s
+misc.o : ../../../Pico/Misc.s
 	@echo $@
 	@$(GCC) $(COPT) $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@
 
-../helix/helix_mp3.a:
-	@make -C ../helix/
+../../common/helix/helix_mp3.a:
+	@make -C ../../common/helix/
 
 
-up: code940.bin
-	@cp -v code940.bin /mnt/gp2x/mnt/sd/emus/PicoDrive/
+up: $(BIN)
+	@cp -v $< /mnt/gp2x/mnt/sd/emus/PicoDrive/
 
 
 # cleanup