platform ps2, handle audio similar to psp

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

diff --git a/platform/gp2x/code940/Makefile b/platform/gp2x/code940/Makefile
index b939d33..2535cfd 100644 (file)
--- a/platform/gp2x/code940/Makefile
+++ b/platform/gp2x/code940/Makefile
@@ -1,29 +1,27 @@
 # you may or may not need to change this\r
 # you may or may not need to change this\r

-#devkit_path = x:/stuff/dev/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
+lgcc_path = $(HOME)/opt/open2x/gcc-4.1.1-glibc-2.3.6/lib/gcc/arm-open2x-linux/4.1.1/\r
+CROSS_COMPILE ?= arm-none-eabi-\r

 \r
 # settings\r
 #up = 1\r
 \r
 \r
 # settings\r
 #up = 1\r
 \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
+CFLAGS += -O3 -Wall -mno-thumb-interwork -fstrict-aliasing -fno-stack-protector -fno-common -ffast-math\r
+CFLAGS += -I../../common/helix/pub -I../../.. -I. -D__GP2X__ -DARM\r
+CFLAGS += -mcpu=arm940t -mtune=arm940t -mabi=apcs-gnu -mfloat-abi=soft -mfpu=fpa\r
+LDFLAGS = -static -e code940 -Ttext 0x0 -L$(lgcc_path) -lgcc\r

 \r
 \r

-GCC = $(CROSS)gcc\r
-STRIP = $(CROSS)strip\r
-AS = $(CROSS)as\r
-LD = $(CROSS)ld\r
-OBJCOPY = $(CROSS)objcopy\r
+GCC = $(CROSS_COMPILE)gcc\r
+STRIP = $(CROSS_COMPILE)strip\r
+AS = $(CROSS_COMPILE)as\r
+LD = $(CROSS_COMPILE)ld\r
+OBJCOPY = $(CROSS_COMPILE)objcopy\r
+\r
+vpath %.c = ../../common\r

 \r
 BIN = pico940_v3.bin\r
 \r
 all: $(BIN)\r
 \r
 \r
 BIN = pico940_v3.bin\r
 \r
 all: $(BIN)\r
 \r

-\r

 .c.o:\r
        @echo ">>>" $<\r
        $(GCC) $(CFLAGS) -c $< -o $@\r
 .c.o:\r
        @echo ">>>" $<\r
        $(GCC) $(CFLAGS) -c $< -o $@\r


@@ -35,7 +33,9 @@ all: $(BIN)
 # stuff for 940 core\r
 \r
 # init, emu_control, emu\r
 # stuff for 940 core\r
 \r
 # init, emu_control, emu\r

-OBJS940 += 940init.o 940.o 940ym2612.o memcpy.o misc_arm.o\r
+OBJS940 += 940init.o 940.o 940ym2612.o misc_arm.o mp3_sync.o\r
+# the asm memcpy code crashes job LOAD2 on 940. Possibly a globbered reg?\r
+# OBJS940 += memcpy.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
 # 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,12 +43,13 @@ OBJS940 += 940init.o 940.o 940ym2612.o memcpy.o misc_arm.o
 OBJS940 += uClibc/memset.o uClibc/s_floor.o uClibc/e_pow.o uClibc/e_sqrt.o uClibc/s_fabs.o\r
 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
 OBJS940 += uClibc/memset.o uClibc/s_floor.o uClibc/e_pow.o uClibc/e_sqrt.o uClibc/s_fabs.o\r
 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

+LIBHELIX ?= ../../common/helix/$(notdir $(CROSS_COMPILE))helix_mp3.a\r

 \r
 $(BIN) : code940.elf\r
        @echo ">>>" $@\r
        $(OBJCOPY) -O binary $< $@\r
 \r
 \r
 $(BIN) : code940.elf\r
        @echo ">>>" $@\r
        $(OBJCOPY) -O binary $< $@\r
 \r

-code940.elf : $(OBJS940) ../../common/helix/$(CROSS)helix-mp3.a\r
+code940.elf : $(OBJS940) $(LIBHELIX)\r

        @echo ">>>" $@\r
        $(LD) $^ $(LDFLAGS) -o $@ -Map code940.map\r
 \r
        @echo ">>>" $@\r
        $(LD) $^ $(LDFLAGS) -o $@ -Map code940.map\r
 \r


@@ -56,15 +57,16 @@ code940.elf : $(OBJS940) ../../common/helix/$(CROSS)helix-mp3.a
        @echo ">>>" $@\r
        $(GCC) $(CFLAGS) -Os -DEXTERNAL_YM2612 -c $< -o $@\r
 \r
        @echo ">>>" $@\r
        $(GCC) $(CFLAGS) -Os -DEXTERNAL_YM2612 -c $< -o $@\r
 \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
 misc_arm.o : ../../../pico/misc_arm.s\r
        @echo ">>>" $@\r
        $(GCC) $(CFLAGS) -DEXTERNAL_YM2612 -c $< -o $@\r
 \r

-../../common/helix/helix_mp3.a:\r
-       @make -C ../../common/helix/\r
+mp3_sync.o: ../../common/mp3_sync.c\r
+       @echo ">>>" $@\r
+       $(GCC) $(CFLAGS) -Os -DCODE940 -c $< -o $@\r
+\r
+$(LIBHELIX):\r
+       @$(MAKE) -C ../../common/helix/ CROSS_COMPILE=$(CROSS_COMPILE)\r

 \r
 \r
 up: $(BIN)\r
 \r
 \r
 up: $(BIN)\r


@@ -81,7 +83,7 @@ tidy:
 ##\r
 OBJSMP3T = mp3test.o ../gp2x.o ../asmutils.o ../usbjoy.o\r
 \r
 ##\r
 OBJSMP3T = mp3test.o ../gp2x.o ../asmutils.o ../usbjoy.o\r
 \r

-mp3test.gpe : $(OBJSMP3T) ../helix/helix_mp3.a\r
+mp3test.gpe : $(OBJSMP3T) $(LIBHELIX)\r

        $(GCC) -static -o $@ $^\r
        $(STRIP) $@\r
        @cp -v $@ /mnt/gp2x/mnt/sd\r
        $(GCC) -static -o $@ $^\r
        $(STRIP) $@\r
        @cp -v $@ /mnt/gp2x/mnt/sd\r