32x: preliminary PWM implementation. 32x opts in menu

[libpicofe.git] / gp2x / Makefile

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 8a18e77..fedadf3 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -1,8 +1,4 @@
-\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
@@ -34,8 +30,7 @@ endif
 DEFINC = -I../.. -I. -DARM -D__GP2X__ -DIN_GP2X -DIN_EVDEV # -DBENCHMARK\r
 CFLAGS += -Wall -Winline\r
 ifeq ($(DEBUG),)\r
-# -ftracer # TODO measure impact\r
-CFLAGS += -O3 -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
+CFLAGS += -O3 -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
 else\r
 CFLAGS += -ggdb\r
 endif\r
@@ -55,7 +50,7 @@ LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy\r
 \r
 # frontend\r
-OBJS += soc.o soc_mmsp2.o soc_pollux.o pollux_set.o emu.o in_gp2x.o plat.o warm.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
@@ -69,13 +64,16 @@ OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o pla
 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 - 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
 # Pico - carthw\r
@@ -88,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
+# 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
@@ -104,9 +102,8 @@ OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o
 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
@@ -118,17 +115,26 @@ endif
 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
 all: mkdirs PicoDrive\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
-PicoDrive : $(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
@@ -150,15 +156,17 @@ ifeq ($(VER),)
 $(error need VER)\r
 endif\r
 endif\r
+CODE940 = code940/pico940_v3.bin\r
 \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
+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