PCM sound, refactored code940

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

diff --git a/platform/gp2x/code940/Makefile b/platform/gp2x/code940/Makefile
index a8322bb..5858381 100644 (file)
--- a/platform/gp2x/code940/Makefile
+++ b/platform/gp2x/code940/Makefile
@@ -11,7 +11,7 @@ CROSS = arm-linux-
 \r
 DEFINC = -I../.. -I. -D__GP2X__ -DARM # -DBENCHMARK\r
 COPT_COMMON = -static -s -O3 -ftracer -fstrength-reduce -Wall -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
-COPT = $(COPT_COMMON) -mtune=arm920t\r
+COPT = $(COPT_COMMON) -mtune=arm940t\r
 GCC = $(CROSS)gcc\r
 STRIP = $(CROSS)strip\r
 AS = $(CROSS)as\r
@@ -20,10 +20,6 @@ OBJCOPY = $(CROSS)objcopy
 \r
 all: code940.bin\r
 \r
-up940:\r
-       @cp -v code940.bin /mnt/gp2x/mnt/sd/games/PicoDrive/\r
-\r
-#      @cmd //C copy code940.bin \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\\r
 \r
 .c.o:\r
        @echo $<\r
@@ -36,7 +32,7 @@ up940:
 # stuff for 940 core\r
 \r
 # init, emu_control, emu\r
-OBJS940 += 940init.o 940.o 940ym2612.o memcpy.o\r
+OBJS940 += 940init.o 940.o 940ym2612.o memcpy.o mix.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
@@ -51,17 +47,21 @@ code940.bin : code940.gpe
 \r
 code940.gpe : $(OBJS940) ../helix/helix_mp3.a\r
        @echo $@\r
-       @$(LD) -static -e code940 -Ttext 0x0 $^ -L$(lgcc_path) -lgcc -o $@\r
+       @$(LD) -static -e code940 -Ttext 0x0 $^ -L$(lgcc_path) -lgcc -o $@ -Map code940.map\r
 \r
 940ym2612.o : ../../../Pico/sound/ym2612.c\r
        @echo $@\r
-       @$(GCC) $(COPT_COMMON) -mtune=arm940t $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@\r
+       @$(GCC) $(COPT) $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@\r
+\r
+mix.o : ../../../Pico/sound/mix.s\r
+       @echo $@\r
+       @$(GCC) $(COPT) $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@\r
 \r
 ../helix/helix_mp3.a:\r
        @make -C ../helix/\r
 \r
 \r
-up:\r
+up: code940.bin\r
        @cp -v code940.bin /mnt/gp2x/mnt/sd/games/PicoDrive/\r
 \r
 \r
@@ -69,7 +69,7 @@ up:
 clean: tidy\r
        @$(RM) code940.bin\r
 tidy:\r
-       @$(RM) code940.gpe $(OBJS940)\r
+       @$(RM) code940.gpe $(OBJS940) code940.map\r
 \r
 \r
 OBJSMP3T = mp3test.o ../gp2x.o ../asmutils.o ../usbjoy.o\r