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

diff --git a/platform/gp2x/code940/Makefile b/platform/gp2x/code940/Makefile
index 8fe170a..6b3f5f8 100644
--- a/platform/gp2x/code940/Makefile
+++ b/platform/gp2x/code940/Makefile
@@ -3,27 +3,25 @@
 #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
 #up = 1
 
 DEFINC = -I../.. -I. -D__GP2X__ -DARM # -DBENCHMARK
-COPT_COMMON = -static -s -O3 -ftracer -fstrength-reduce -Wall -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math
-COPT = $(COPT_COMMON) -mtune=arm920t
+COPT_COMMON = -static -s -O2 -ftracer -fstrength-reduce -Wall -fomit-frame-pointer -fstrict-aliasing -ffast-math
+COPT = $(COPT_COMMON) -mtune=arm940t
 GCC = $(CROSS)gcc
 STRIP = $(CROSS)strip
 AS = $(CROSS)as
 LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy
 
-all: code940.bin
+BIN = pico940_v2.bin
 
-up940:
-	@cp -v code940.bin /mnt/gp2x/mnt/sd/games/PicoDrive/
+all: $(BIN)
 
-#	@cmd //C copy code940.bin \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\
 
 .c.o:
 	@echo $<
@@ -36,7 +34,7 @@ up940:
 # stuff for 940 core
 
 # init, emu_control, emu
-OBJS940 += 940init.o 940.o 940ym2612.o memcpy.o
+OBJS940 += 940init.o 940.o 940ym2612.o memcpy.o mix.o misc.o
 # the asm code seems to be faster when run on 920, but not on 940 for some reason
 # OBJS940 += ../../Pico/sound/ym2612_asm.o
 
@@ -45,27 +43,38 @@ 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 $@
+	@$(LD) -static -e code940 -Ttext 0x0 $^ -L$(lgcc_path) -lgcc -o $@ -Map code940.map
 
 940ym2612.o : ../../../Pico/sound/ym2612.c
 	@echo $@
-	@$(GCC) $(COPT_COMMON) -mtune=arm940t $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@
+	@$(GCC) $(COPT) -Os $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@
 
-../helix/helix_mp3.a:
-	@make -C ../helix/
+mix.o : ../../../Pico/sound/mix.s
+	@echo $@
+	@$(GCC) $(COPT) $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@
+misc.o : ../../../Pico/Misc.s
+	@echo $@
+	@$(GCC) $(COPT) $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@
+
+../../common/helix/helix_mp3.a:
+	@make -C ../../common/helix/
+
+
+up: $(BIN)
+	@cp -v $< /mnt/gp2x/mnt/sd/emus/PicoDrive/
 
 
 # cleanup
 clean: tidy
 	@$(RM) code940.bin
 tidy:
-	@$(RM) code940.gpe $(OBJS940)
+	@$(RM) code940.gpe $(OBJS940) code940.map
 
 
 OBJSMP3T = mp3test.o ../gp2x.o ../asmutils.o ../usbjoy.o