unify helix mp3 code, some sound adjustments

[picodrive.git] / platform / gp2x / code940 / Makefile

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