#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
+export CROSS = arm-linux-\r
#CROSS = $(devkit_path)bin/arm-linux-\r
\r
# 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=arm920t\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
AS = $(CROSS)as\r
LD = $(CROSS)ld\r
OBJCOPY = $(CROSS)objcopy\r
\r
-all: code940.bin\r
+BIN = pico940_v2.bin\r
\r
-up940:\r
- @cp -v code940.bin /mnt/gp2x/mnt/sd/games/PicoDrive/\r
+all: $(BIN)\r
\r
-# @cmd //C copy code940.bin \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\\r
\r
.c.o:\r
@echo $<\r
# 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 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
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
-code940.gpe : $(OBJS940) ../helix/helix_mp3.a\r
+code940.gpe : $(OBJS940) ../../common/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) -Os $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@\r
\r
-../helix/helix_mp3.a:\r
- @make -C ../helix/\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
+../../common/helix/helix_mp3.a:\r
+ @make -C ../../common/helix/\r
+\r
+\r
+up: $(BIN)\r
+ @cp -v $< /mnt/gp2x/mnt/sd/emus/PicoDrive/\r
\r
\r
# cleanup\r
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