-\r
-# you may or may not need to change this\r
-#devkit_path = x:/stuff/dev/devkitgp2x/\r
export CROSS = arm-linux-\r
-#CROSS = $(devkit_path)bin/arm-linux-\r
\r
# settings\r
#mz80 = 1\r
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 -DIN_EVDEV # -DBENCHMARK\r
+CFLAGS += -Wall -Winline\r
ifeq ($(DEBUG),)\r
-COPT_COMMON += -O3 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
+CFLAGS += -O3 -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 asm_utils.o\r
+OBJS += plat.o warm.o pollux_set.o soc.o soc_mmsp2.o soc_pollux.o emu.o in_gp2x.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/readpng.o platform/common/mp3_helix.o\r
+ platform/common/arm_utils.o platform/common/arm_linux.o platform/common/readpng.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 platform/linux/in_evdev.o\r
\r
# Pico\r
ifeq "$(amalgamate)" "1"\r
-OBJS += ../../PicoAll.o\r
+OBJS += ../../picoAll.o\r
else\r
-OBJS += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.o Pico/Pico.o Pico/Sek.o \\r
- Pico/VideoPort.o Pico/Draw2.o Pico/Draw.o Pico/Patch.o Pico/Debug.o\r
+OBJS += pico/area.o pico/cart.o pico/memory.o pico/pico.o pico/sek.o pico/z80if.o \\r
+ pico/videoport.o pico/draw2.o pico/draw.o pico/mode4.o pico/sms.o \\r
+ pico/misc.o pico/eeprom.o pico/patch.o pico/debug.o\r
# Pico - CD\r
-OBJS += Pico/cd/Pico.o Pico/cd/Memory.o Pico/cd/Sek.o Pico/cd/LC89510.o \\r
- Pico/cd/cd_sys.o Pico/cd/cd_file.o Pico/cd/cue.o Pico/cd/gfx_cd.o \\r
- Pico/cd/Area.o Pico/cd/Misc.o Pico/cd/pcm.o Pico/cd/buffering.o\r
+OBJS += pico/cd/pico.o pico/cd/memory.o pico/cd/sek.o pico/cd/LC89510.o \\r
+ pico/cd/cd_sys.o pico/cd/cd_file.o pico/cd/cue.o pico/cd/gfx_cd.o \\r
+ pico/cd/area.o pico/cd/misc.o pico/cd/pcm.o pico/cd/buffering.o\r
endif\r
+# Pico - 32X\r
+OBJS += pico/32x/32x.o pico/32x/memory.o pico/32x/draw.o pico/32x/pwm.o\r
# Pico - Pico\r
-OBJS += Pico/Pico/Pico.o Pico/Pico/Memory.o Pico/Pico/xpcm.o\r
+OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o\r
# Pico - carthw\r
-OBJS += Pico/carthw/carthw.o Pico/carthw/svp/svp.o Pico/carthw/svp/Memory.o \\r
- Pico/carthw/svp/ssp16.o Pico/carthw/svp/compiler.o Pico/carthw/svp/stub_arm.o\r
-\r
-# asm stuff\r
-ifeq "$(asm_render)" "1"\r
-DEFINC += -D_ASM_DRAW_C\r
-OBJS += Pico/draw_asm.o Pico/draw2_asm.o\r
-endif\r
-ifeq "$(asm_memory)" "1"\r
-DEFINC += -D_ASM_MEMORY_C\r
-OBJS += Pico/memory_asm.o\r
-endif\r
-ifeq "$(asm_ym2612)" "1"\r
-DEFINC += -D_ASM_YM2612_C\r
-OBJS += Pico/sound/ym2612_asm.o\r
-endif\r
-ifeq "$(asm_misc)" "1"\r
-DEFINC += -D_ASM_MISC_C\r
-OBJS += Pico/misc_asm.o\r
-OBJS += Pico/cd/misc_asm.o\r
-endif\r
-ifeq "$(asm_cdpico)" "1"\r
-DEFINC += -D_ASM_CD_PICO_C\r
-OBJS += Pico/cd/pico_asm.o\r
-endif\r
-ifeq "$(asm_cdmemory)" "1"\r
-DEFINC += -D_ASM_CD_MEMORY_C\r
-OBJS += Pico/cd/memory_asm.o\r
-endif\r
+OBJS += pico/carthw/carthw.o pico/carthw/svp/svp.o pico/carthw/svp/memory.o \\r
+ pico/carthw/svp/ssp16.o pico/carthw/svp/compiler.o pico/carthw/svp/stub_arm.o\r
\r
# Pico - sound\r
ifneq "$(amalgamate)" "1"\r
-OBJS += Pico/sound/sound.o\r
+OBJS += pico/sound/sound.o\r
endif\r
-OBJS += Pico/sound/mix_asm.o\r
-OBJS += Pico/sound/sn76496.o Pico/sound/ym2612.o\r
+OBJS += pico/sound/mix_arm.o\r
+OBJS += pico/sound/sn76496.o pico/sound/ym2612.o\r
+# unzip\r
+OBJS += unzip/unzip.o unzip/unzip_stream.o\r
# zlib\r
OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \\r
zlib/deflate.o zlib/crc32.o zlib/adler32.o zlib/zutil.o zlib/compress.o\r
-# unzip\r
-OBJS += unzip/unzip.o unzip/unzip_stream.o\r
# debug\r
ifeq "$(debug_cyclone)" "1"\r
-OBJS += Pico/DebugCPU.o cpu/musashi/m68kdasm.o\r
+OBJS += pico/DebugCPU.o cpu/musashi/m68kdasm.o\r
endif\r
# CPU cores\r
ifeq "$(use_musashi)" "1"\r
endif\r
ifeq "$(use_cyclone)" "1"\r
DEFINC += -DEMU_C68K\r
-OBJS += cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o\r
+OBJS += pico/m68kif_cyclone.o cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o\r
endif\r
-# drz80/mz80\r
ifeq "$(mz80)" "1"\r
DEFINC += -D_USE_MZ80\r
OBJS += cpu/mz80/mz80.o\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
\r
+DIRS = platform platform/gp2x platform/linux platform/common pico pico/cd pico/pico pico/32x \\r
+ pico/sound pico/carthw/svp zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools \\r
+ cpu/mz80 cpu/DrZ80\r
+\r
+\r
+all: mkdirs PicoDrive\r
+\r
+include ../common/common_arm.mak\r
+include ../common/revision.mak\r
\r
-all: mkdirs PicoDrive.gpe\r
+# partial linking helps profiled builds due to section merging\r
+PicoDrive.o : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a\r
+ $(LD) -r -o $@ $^\r
\r
-PicoDrive.gpe : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a\r
+# still using static, dynamic linking slows Wiz 1-10%\r
+# also libm on F100 is not compatible\r
+PicoDrive : PicoDrive.o\r
@echo ">>>" $@\r
- $(CC) -o $@ $(CFLAGS) $^ -lm -lpng -Wl,-Map=PicoDrive.map\r
+ $(CC) -static -o $@ $(CFLAGS) $^ -lm -lpng -Wl,-Map=$@.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
-\r
-# @cmd //C copy PicoDrive.gpe \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\\r
+up: PicoDrive\r
+ @cp -v PicoDrive /mnt/gp2x/mnt/sd/emus/PicoDrive/\r
\r
-# cleanup\r
clean: tidy\r
- $(RM) PicoDrive.gpe\r
+ $(RM) PicoDrive\r
tidy:\r
$(RM) $(OBJS)\r
-# rm -rf $(DIRS) # don't clean, gcda may be there\r
-# @make -C ../../cpu/Cyclone/proj -f Makefile.linux clean\r
-\r
\r
readme.txt: ../../tools/textfilter ../base_readme.txt\r
../../tools/textfilter ../base_readme.txt $@ GP2X\r
\r
-include ../common/common_arm.mak\r
-\r
# ----------- release -----------\r
ifneq ($(findstring rel,$(MAKECMDGOALS)),)\r
ifeq ($(VER),)\r
$(error need VER)\r
endif\r
endif\r
+CODE940 = code940/pico940_v3.bin\r
\r
-rel: 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
+rel: PicoDrive PicoDrive.gpe $(CODE940) readme.txt PicoDrive.png ../game_def.cfg \\r
+ warm_2.4.25.o warm_2.4.26-open2x.o warm_2.6.24.ko\r
+ zip -9 -j ../../PicoDrive_$(VER).zip $^\r
zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt\r
mkdir bin_to_cso_mp3\r
cp ../../tools/bin_to_cso_mp3/* bin_to_cso_mp3/\r
zip -9 -r ../../PicoDrive_$(VER).zip bin_to_cso_mp3\r
rm -rf bin_to_cso_mp3\r
\r
-code940/code940.bin:\r
+$(CODE940):\r
make -C code940/\r
\r
notaz.gp2x.de / libpicofe.git / blobdiff