use_cyclone = 1\r
endif\r
\r
-DEFINC = -I../.. -I. -DARM -D__GP2X__ # -DBENCHMARK\r
-COPT_COMMON = -static -Wall -Winline\r
+DEFINC = -I../.. -I. -DARM -D__GP2X__ -DIN_GP2X # -DBENCHMARK\r
+CFLAGS += -Wall -Winline\r
ifeq ($(DEBUG),)\r
-COPT_COMMON += -O3 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
+# -ftracer # TODO measure impact\r
+CFLAGS += -O3 -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
else\r
-COPT_COMMON += -ggdb\r
+CFLAGS += -ggdb\r
endif\r
ifeq "$(profile)" "1"\r
-COPT_COMMON += -fprofile-generate\r
+CFLAGS += -fprofile-generate\r
endif\r
ifeq "$(profile)" "2"\r
-COPT_COMMON += -fprofile-use\r
+CFLAGS += -fprofile-use\r
endif\r
-CFLAGS = $(COPT_COMMON) -mcpu=arm920t -mtune=arm920t\r
+CFLAGS += -mcpu=arm920t -mtune=arm920t\r
SFLAGS = $(CFLAGS)\r
ASFLAGS = -mcpu=arm920t -mfloat-abi=soft\r
CC = $(CROSS)gcc\r
OBJCOPY = $(CROSS)objcopy\r
\r
# frontend\r
-OBJS += main.o menu.o gp2x.o usbjoy.o emu.o squidgehack.o cpuctrl.o\r
+OBJS += soc.o soc_mmsp2.o soc_pollux.o pollux_set.o emu.o in_gp2x.o plat.o warm.o\r
# 940 core control\r
OBJS += 940ctl.o\r
\r
# common\r
OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \\r
platform/common/arm_utils.o platform/common/arm_linux.o platform/common/readpng.o \\r
- platform/common/mp3_helix.o\r
+ platform/common/mp3_helix.o platform/common/input.o platform/common/main.o \\r
+ platform/linux/sndout_oss.o platform/linux/plat.o\r
\r
# Pico\r
ifeq "$(amalgamate)" "1"\r
vpath %.c = ../..\r
vpath %.s = ../..\r
vpath %.S = ../..\r
-DIRS = platform platform/gp2x platform/common pico pico/cd pico/pico pico/sound pico/carthw/svp \\r
- zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80\r
+DIRS = platform platform/gp2x platform/linux platform/common pico pico/cd pico/pico pico/sound \\r
+ pico/carthw/svp zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80\r
\r
\r
-all: mkdirs PicoDrive.gpe\r
+all: mkdirs PicoDrive\r
\r
include ../common/common_arm.mak\r
\r
-PicoDrive.gpe : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a\r
+PicoDrive : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a\r
@echo ">>>" $@\r
$(CC) -o $@ $(CFLAGS) $^ -lm -lpng -Wl,-Map=PicoDrive.map\r
ifeq ($(DEBUG),)\r
$(STRIP) $@\r
endif\r
\r
-up: PicoDrive.gpe\r
- @cp -v PicoDrive.gpe /mnt/gp2x/mnt/sd/emus/PicoDrive/\r
+up: PicoDrive\r
+ @cp -v PicoDrive /mnt/gp2x/mnt/sd/emus/PicoDrive/\r
\r
clean: tidy\r
- $(RM) PicoDrive.gpe\r
+ $(RM) PicoDrive\r
tidy:\r
$(RM) $(OBJS)\r
\r
endif\r
endif\r
\r
-rel: PicoDrive.gpe code940/pico940_v3.bin readme.txt PicoDrive.man.txt PicoDrive.png ../game_def.cfg\r
+rel: PicoDrive PicoDrive.gpe code940/pico940_v3.bin readme.txt PicoDrive.man.txt PicoDrive.png ../game_def.cfg\r
zip -9 -j ../../PicoDrive_$(VER).zip $^ mmuhack.o\r
zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt\r
mkdir bin_to_cso_mp3\r