fix DrawSpritesHiAS

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

diff --git a/platform/gp2x/code940/Makefile b/platform/gp2x/code940/Makefile
index 26eecba..e327d13 100644 (file)
--- a/platform/gp2x/code940/Makefile
+++ b/platform/gp2x/code940/Makefile
@@ -1,7 +1,6 @@
-\r
 # you may or may not need to change this\r
 #devkit_path = x:/stuff/dev/devkitgp2x/\r
-devkit_path = /usr/local/devkitPro/devkitGP2X/\r
+devkit_path ?= $(HOME)/opt/devkitGP2X/\r
 lgcc_path = $(devkit_path)lib/gcc/arm-linux/4.0.3/\r
 CROSS = arm-linux-\r
 #CROSS = $(devkit_path)bin/arm-linux-\r
@@ -9,30 +8,35 @@ CROSS = arm-linux-
 # settings\r
 #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 = $(COPT_COMMON) -mtune=arm940t\r
+CFLAGS += -O2 -Wall -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
+CFLAGS += -I../.. -I. -D__GP2X__ -DARM\r
+CFLAGS += -mcpu=arm940t -mtune=arm940t\r
+LDFLAGS = -static -s -e code940 -Ttext 0x0 -L$(lgcc_path) -lgcc\r
+\r
 GCC = $(CROSS)gcc\r
 STRIP = $(CROSS)strip\r
 AS = $(CROSS)as\r
 LD = $(CROSS)ld\r
 OBJCOPY = $(CROSS)objcopy\r
 \r
-all: code940.bin\r
+vpath %.c = ../../common\r
 \r
+BIN = pico940_v3.bin\r
+\r
+all: $(BIN)\r
 \r
 .c.o:\r
-       @echo $<\r
-       $(GCC) $(COPT) $(DEFINC) -c $< -o $@\r
+       @echo ">>>" $<\r
+       $(GCC) $(CFLAGS) -c $< -o $@\r
 .s.o:\r
-       @echo $<\r
-       $(GCC) $(COPT) $(DEFINC) -c $< -o $@\r
+       @echo ">>>" $<\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 mp3.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,40 +45,41 @@ 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
-       @echo $@\r
-       @$(OBJCOPY) -O binary $< $@\r
+$(BIN) : code940.elf\r
+       @echo ">>>" $@\r
+       $(OBJCOPY) -O binary $< $@\r
 \r
-code940.gpe : $(OBJS940) ../helix/helix_mp3.a\r
-       @echo $@\r
-       @$(LD) -static -e code940 -Ttext 0x0 $^ -L$(lgcc_path) -lgcc -o $@ -Map code940.map\r
+code940.elf : $(OBJS940) ../../common/helix/$(CROSS)helix-mp3.a\r
+       @echo ">>>" $@\r
+       $(LD) $^ $(LDFLAGS) -o $@ -Map code940.map\r
 \r
-940ym2612.o : ../../../Pico/sound/ym2612.c\r
-       @echo $@\r
-       @$(GCC) $(COPT) $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@\r
+940ym2612.o : ../../../pico/sound/ym2612.c\r
+       @echo ">>>" $@\r
+       $(GCC) $(CFLAGS) -Os -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
+mix.o : ../../../pico/sound/mix.s\r
+       @echo ">>>" $@\r
+       $(GCC) $(CFLAGS) -DEXTERNAL_YM2612 -c $< -o $@\r
+misc_arm.o : ../../../pico/misc_arm.s\r
+       @echo ">>>" $@\r
+       $(GCC) $(CFLAGS) -DEXTERNAL_YM2612 -c $< -o $@\r
 \r
-../helix/helix_mp3.a:\r
-       @make -C ../helix/\r
+../../common/helix/helix_mp3.a:\r
+       @make -C ../../common/helix/\r
 \r
 \r
-up: code940.bin\r
-       @cp -v code940.bin /mnt/gp2x/mnt/sd/emus/PicoDrive/\r
+up: $(BIN)\r
+       @cp -v $< /mnt/gp2x/mnt/sd/emus/PicoDrive/\r
 \r
 \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
+##\r
 OBJSMP3T = mp3test.o ../gp2x.o ../asmutils.o ../usbjoy.o\r
 \r
 mp3test.gpe : $(OBJSMP3T) ../helix/helix_mp3.a\r
@@ -85,10 +90,3 @@ mp3test.gpe : $(OBJSMP3T) ../helix/helix_mp3.a
 cleanmp3test:\r
        $(RM) $(OBJSMP3T) mp3test.gpe\r
 \r
-# uClibc/e_pow.o : uClibc/e_pow.c\r
-#      @echo $<\r
-#      @$(GCC) $(COPT) $(DEFINC) -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