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

diff --git a/platform/gp2x/code940/Makefile b/platform/gp2x/code940/Makefile
index a344e02..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,7 @@ AS = $(CROSS)as
 LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy
 
-BIN = pico940.bin
+BIN = pico940_v2.bin
 
 all: $(BIN)
 
@@ -47,7 +47,7 @@ $(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
 
@@ -58,12 +58,12 @@ 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: $(BIN)