X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2Fcode940%2FMakefile;h=886ded9af08c8b7ab133e3dca3b72c7b81968975;hb=bca23c1c797cf33c2c6812962c479398e644f0aa;hp=ab88bf119a09bb5927458796808b1c9f9011b444;hpb=e4fb433cd685d06ddbf0ec367c19a38b75d6ac68;p=picodrive.git

diff --git a/platform/gp2x/code940/Makefile b/platform/gp2x/code940/Makefile
index ab88bf1..886ded9 100644
--- a/platform/gp2x/code940/Makefile
+++ b/platform/gp2x/code940/Makefile
@@ -9,9 +9,10 @@ export CROSS = arm-linux-
 # settings
 #up = 1
 
-DEFINC = -I../.. -I. -D__GP2X__ -DARM # -DBENCHMARK
-COPT_COMMON = -static -s -O2 -ftracer -fstrength-reduce -Wall -fomit-frame-pointer -fstrict-aliasing -ffast-math
-COPT = $(COPT_COMMON) -mtune=arm940t
+DEFINC = -I../.. -I. -D__GP2X__ -DARM
+# -ftracer
+COPT_COMMON = -static -s -O2 -Wall -fomit-frame-pointer -fstrict-aliasing -ffast-math
+CFLAGS = $(COPT_COMMON) $(DEFINC) -mcpu=arm940t -mtune=arm940t
 GCC = $(CROSS)gcc
 STRIP = $(CROSS)strip
 AS = $(CROSS)as
@@ -25,16 +26,16 @@ all: $(BIN)
 
 .c.o:
 	@echo ">>>" $<
-	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
+	$(GCC) $(CFLAGS) -c $< -o $@
 .s.o:
 	@echo ">>>" $<
-	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
+	$(GCC) $(CFLAGS) -c $< -o $@
 
 
 # stuff for 940 core
 
 # init, emu_control, emu
-OBJS940 += 940init.o 940.o 940ym2612.o memcpy.o mix.o misc.o
+OBJS940 += 940init.o 940.o 940ym2612.o memcpy.o misc_arm.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
 
@@ -43,24 +44,24 @@ 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
 
-$(BIN) : code940.gpe
+$(BIN) : code940.elf
 	@echo ">>>" $@
 	$(OBJCOPY) -O binary $< $@
 
-code940.gpe : $(OBJS940) ../../common/helix/helix_mp3.a
+code940.elf : $(OBJS940) ../../common/helix/$(CROSS)helix-mp3.a
 	@echo ">>>" $@
 	$(LD) -static -e code940 -Ttext 0x0 $^ -L$(lgcc_path) -lgcc -o $@ -Map code940.map
 
-940ym2612.o : ../../../Pico/sound/ym2612.c
+940ym2612.o : ../../../pico/sound/ym2612.c
 	@echo ">>>" $@
-	$(GCC) $(COPT) -Os $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@
+	$(GCC) $(CFLAGS) -Os -DEXTERNAL_YM2612 -c $< -o $@
 
-mix.o : ../../../Pico/sound/mix.s
+mix.o : ../../../pico/sound/mix.s
 	@echo ">>>" $@
-	$(GCC) $(COPT) $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@
-misc.o : ../../../Pico/Misc.s
+	$(GCC) $(CFLAGS) -DEXTERNAL_YM2612 -c $< -o $@
+misc_arm.o : ../../../pico/misc_arm.s
 	@echo ">>>" $@
-	$(GCC) $(COPT) $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@
+	$(GCC) $(CFLAGS) -DEXTERNAL_YM2612 -c $< -o $@
 
 ../../common/helix/helix_mp3.a:
 	@make -C ../../common/helix/
@@ -72,9 +73,9 @@ up: $(BIN)
 
 # cleanup
 clean: tidy
-	@$(RM) code940.bin
+	$(RM) $(BIN)
 tidy:
-	@$(RM) code940.gpe $(OBJS940) code940.map
+	$(RM) code940.elf $(OBJS940) code940.map
 
 
 OBJSMP3T = mp3test.o ../gp2x.o ../asmutils.o ../usbjoy.o
@@ -89,8 +90,8 @@ cleanmp3test:
 
 # uClibc/e_pow.o : uClibc/e_pow.c
 #	@echo $<
-#	@$(GCC) $(COPT) $(DEFINC) -fno-profile-generate -c $< -o $@
+#	@$(GCC) $(CFLAGS) -fno-profile-generate -c $< -o $@
 
 # uClibc/e_sqrt.o : uClibc/e_sqrt.c
 #	@echo $<
-#	@$(GCC) $(COPT) $(DEFINC) -fno-profile-generate -c $< -o $@
+#	@$(GCC) $(CFLAGS) -fno-profile-generate -c $< -o $@