newstyle key config, code940.bin -> pico940.bin

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

diff --git a/platform/gp2x/code940/Makefile b/platform/gp2x/code940/Makefile
index 5858381..a344e02 100644 (file)
--- a/platform/gp2x/code940/Makefile
+++ b/platform/gp2x/code940/Makefile
@@ -10,7 +10,7 @@ CROSS = arm-linux-
 #up = 1\r
 \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_COMMON = -static -s -O2 -ftracer -fstrength-reduce -Wall -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
 COPT = $(COPT_COMMON) -mtune=arm940t\r
 GCC = $(CROSS)gcc\r
 STRIP = $(CROSS)strip\r
@@ -18,7 +18,9 @@ AS = $(CROSS)as
 LD = $(CROSS)ld\r
 OBJCOPY = $(CROSS)objcopy\r
 \r
-all: code940.bin\r
+BIN = pico940.bin\r
+\r
+all: $(BIN)\r
 \r
 \r
 .c.o:\r
@@ -32,7 +34,7 @@ all: code940.bin
 # stuff for 940 core\r
 \r
 # init, emu_control, emu\r
-OBJS940 += 940init.o 940.o 940ym2612.o memcpy.o mix.o\r
+OBJS940 += 940init.o 940.o 940ym2612.o memcpy.o mix.o misc.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
@@ -41,7 +43,7 @@ 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
-code940.bin : code940.gpe\r
+$(BIN) : code940.gpe\r
        @echo $@\r
        @$(OBJCOPY) -O binary $< $@\r
 \r
@@ -51,18 +53,21 @@ code940.gpe : $(OBJS940) ../helix/helix_mp3.a
 \r
 940ym2612.o : ../../../Pico/sound/ym2612.c\r
        @echo $@\r
-       @$(GCC) $(COPT) $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@\r
+       @$(GCC) $(COPT) -Os $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@\r
 \r
 mix.o : ../../../Pico/sound/mix.s\r
        @echo $@\r
        @$(GCC) $(COPT) $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@\r
+misc.o : ../../../Pico/misc.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: code940.bin\r
-       @cp -v code940.bin /mnt/gp2x/mnt/sd/games/PicoDrive/\r
+up: $(BIN)\r
+       @cp -v $< /mnt/gp2x/mnt/sd/emus/PicoDrive/\r
 \r
 \r
 # cleanup\r