notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
32x: more wip
[picodrive.git]
/
platform
/
gp2x
/
Makefile
diff --git
a/platform/gp2x/Makefile
b/platform/gp2x/Makefile
index
ed4f928
..
8a061cb
100644
(file)
--- a/
platform/gp2x/Makefile
+++ b/
platform/gp2x/Makefile
@@
-1,18
+1,14
@@
-
\r
-# you may or may not need to change this
\r
-#devkit_path = x:/stuff/dev/devkitgp2x/
\r
export CROSS = arm-linux-
\r
export CROSS = arm-linux-
\r
-#CROSS = $(devkit_path)bin/arm-linux-
\r
\r
# settings
\r
#mz80 = 1
\r
#debug_cyclone = 1
\r
\r
# settings
\r
#mz80 = 1
\r
#debug_cyclone = 1
\r
-asm_memory = 1
\r
+#asm_memory = 1 # TODO
\r
asm_render = 1
\r
asm_ym2612 = 1
\r
asm_misc = 1
\r
asm_cdpico = 1
\r
asm_render = 1
\r
asm_ym2612 = 1
\r
asm_misc = 1
\r
asm_cdpico = 1
\r
-asm_cdmemory = 1
\r
+#asm_cdmemory = 1 # TODO
\r
amalgamate = 0
\r
#profile = 1
\r
#use_musashi = 1
\r
amalgamate = 0
\r
#profile = 1
\r
#use_musashi = 1
\r
@@
-31,20
+27,20
@@
else
use_cyclone = 1
\r
endif
\r
\r
use_cyclone = 1
\r
endif
\r
\r
-DEFINC = -I../.. -I. -DARM -D__GP2X__ # -DBENCHMARK
\r
-C
OPT_COMMON = -static
-Wall -Winline
\r
+DEFINC = -I../.. -I. -DARM -D__GP2X__
-DIN_GP2X -DIN_EVDEV
# -DBENCHMARK
\r
+C
FLAGS +=
-Wall -Winline
\r
ifeq ($(DEBUG),)
\r
ifeq ($(DEBUG),)
\r
-C
OPT_COMMON += -O3 -ftracer -fstrength-reduce
-fomit-frame-pointer -fstrict-aliasing -ffast-math
\r
+C
FLAGS += -O3
-fomit-frame-pointer -fstrict-aliasing -ffast-math
\r
else
\r
else
\r
-C
OPT_COMMON
+= -ggdb
\r
+C
FLAGS
+= -ggdb
\r
endif
\r
ifeq "$(profile)" "1"
\r
endif
\r
ifeq "$(profile)" "1"
\r
-C
OPT_COMMON
+= -fprofile-generate
\r
+C
FLAGS
+= -fprofile-generate
\r
endif
\r
ifeq "$(profile)" "2"
\r
endif
\r
ifeq "$(profile)" "2"
\r
-C
OPT_COMMON
+= -fprofile-use
\r
+C
FLAGS
+= -fprofile-use
\r
endif
\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
SFLAGS = $(CFLAGS)
\r
ASFLAGS = -mcpu=arm920t -mfloat-abi=soft
\r
CC = $(CROSS)gcc
\r
@@
-54,26
+50,30
@@
LD = $(CROSS)ld
OBJCOPY = $(CROSS)objcopy
\r
\r
# frontend
\r
OBJCOPY = $(CROSS)objcopy
\r
\r
# frontend
\r
-OBJS +=
main.o menu.o gp2x.o emu.o squidgehack.o cpuctrl
.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/arm_linux.o platform/common/readpng.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 platform/linux/usbjoy.o platform/linux/sndout_oss.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
else
\r
\r
# Pico
\r
ifeq "$(amalgamate)" "1"
\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
endif
\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
endif
\r
+# Pico - 32X
\r
+OBJS += pico/32x/32x.o pico/32x/memory.o pico/32x/draw.o
\r
# Pico - Pico
\r
OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o
\r
# Pico - carthw
\r
# Pico - Pico
\r
OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o
\r
# Pico - carthw
\r
@@
-86,11
+86,11
@@
OBJS += pico/sound/sound.o
endif
\r
OBJS += pico/sound/mix_arm.o
\r
OBJS += pico/sound/sn76496.o pico/sound/ym2612.o
\r
endif
\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
# 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
# debug
\r
ifeq "$(debug_cyclone)" "1"
\r
OBJS += pico/DebugCPU.o cpu/musashi/m68kdasm.o
\r
@@
-104,7
+104,6
@@
ifeq "$(use_cyclone)" "1"
DEFINC += -DEMU_C68K
\r
OBJS += cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o
\r
endif
\r
DEFINC += -DEMU_C68K
\r
OBJS += 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
ifeq "$(mz80)" "1"
\r
DEFINC += -D_USE_MZ80
\r
OBJS += cpu/mz80/mz80.o
\r
@@
-116,26
+115,35
@@
endif
vpath %.c = ../..
\r
vpath %.s = ../..
\r
vpath %.S = ../..
\r
vpath %.c = ../..
\r
vpath %.s = ../..
\r
vpath %.S = ../..
\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
+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
\r
\r
-all: mkdirs PicoDrive
.gpe
\r
+all: mkdirs PicoDrive
\r
\r
include ../common/common_arm.mak
\r
\r
include ../common/common_arm.mak
\r
+include ../common/revision.mak
\r
+
\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
\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
@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
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
\r
clean: tidy
\r
- $(RM) PicoDrive
.gpe
\r
+ $(RM) PicoDrive
\r
tidy:
\r
$(RM) $(OBJS)
\r
\r
tidy:
\r
$(RM) $(OBJS)
\r
\r
@@
-148,15
+156,17
@@
ifeq ($(VER),)
$(error need VER)
\r
endif
\r
endif
\r
$(error need VER)
\r
endif
\r
endif
\r
+CODE940 = code940/pico940_v3.bin
\r
\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
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
make -C code940/
\r
\r