code940 now plays mp3s

[libpicofe.git] / gp2x / Makefile

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 602e4f6..11e6749 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -1,8 +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
-lgcc_path = $(devkit_path)lib/gcc/arm-linux/4.0.3/\r
 CROSS = arm-linux-\r
 #CROSS = $(devkit_path)bin/arm-linux-\r
 \r
@@ -17,7 +15,7 @@ asm_ym2612 = 1
 #use_musashi = 1\r
 #up = 1\r
 \r
-DEFINC = -I../.. -I. -D__GP2X__ -D_UNZIP_SUPPORT # -DBENCHMARK\r
+DEFINC = -I../.. -I. -DARM -D__GP2X__ -D_UNZIP_SUPPORT # -DBENCHMARK\r
 COPT_COMMON = -static -s -O3 -ftracer -fstrength-reduce -Wall -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
 ifeq "$(profile)" "1"\r
 COPT_COMMON += -fprofile-generate\r
@@ -80,7 +78,7 @@ DEFINC += -D_USE_DRZ80
 OBJS += ../../cpu/DrZ80/drz80.o\r
 endif\r
 \r
-all: PicoDrive.gpe code940.bin\r
+all: PicoDrive.gpe\r
 \r
 PicoDrive.gpe : $(OBJS)\r
        @echo $@\r
@@ -92,15 +90,11 @@ ifeq "$(up)" "1"
        @cmd //C copy $@ \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\\r
 endif\r
 \r
-up: # up940\r
+up:\r
        @cp -v PicoDrive.gpe /mnt/gp2x/mnt/sd/games/PicoDrive/\r
 \r
 #      @cmd //C copy PicoDrive.gpe \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\\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
 testrefr.gpe : test.o gp2x.o asmutils.o\r
        @echo $@\r
@@ -133,45 +127,13 @@ testrefr.gpe : test.o gp2x.o asmutils.o
        @make -C ../../cpu/Cyclone/proj -f Makefile.linux\r
 \r
 \r
-# stuff for 940 core\r
-\r
-# init, emu_control, emu\r
-OBJS940 += 940init.o 940.o 940ym2612.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
-# uClibc library code\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
-\r
-code940.bin : code940.gpe\r
-       @echo $@\r
-       @$(OBJCOPY) -O binary $< $@\r
-\r
-code940.gpe : $(OBJS940)\r
-       @echo $@\r
-       @$(LD) -static -e code940 -Ttext 0x0 $^ -L$(lgcc_path) -lgcc -o $@\r
-\r
-940ym2612.o : ../../Pico/sound/ym2612.c\r
-       @echo $@\r
-       @$(GCC) $(COPT_COMMON) -mtune=arm940t $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@\r
-\r
-\r
 # cleanup\r
-clean: clean_pd clean_940\r
-tidy: tidy_pd tidy_940\r
-\r
-clean_pd: tidy_pd\r
+clean: tidy\r
        @$(RM) PicoDrive.gpe\r
-tidy_pd:\r
+tidy:\r
        @$(RM) $(OBJS)\r
 #      @make -C ../../cpu/Cyclone/proj -f Makefile.linux clean\r
 \r
-clean_940: tidy_940\r
-       @$(RM) code940.bin\r
-tidy_940:\r
-       @$(RM) code940.gpe $(OBJS940)\r
 \r
 clean_prof:\r
        find ../.. -name '*.gcno' -delete\r
@@ -190,10 +152,3 @@ usbjoy.o : usbjoy.c
        @echo $<\r
        @$(GCC) $(COPT) $(DEFINC) -fno-profile-generate -c $< -o $@\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