X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2FMakefile;h=f2000ad6bc25ea43bf51b55dcadac82b2b423e92;hb=b3158e9837629be3d36176728848f10fba341fc9;hp=00fdb789ef782144619d54df95d0c068bd6a74d9;hpb=ee2a3bdfa5a969ea9446b2d08748f16e29bbd4d5;p=picodrive.git

diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index 00fdb78..f2000ad 100644
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -1,8 +1,4 @@
-
-# you may or may not need to change this
-#devkit_path = x:/stuff/dev/devkitgp2x/
 export CROSS = arm-linux-
-#CROSS = $(devkit_path)bin/arm-linux-
 
 # settings
 #mz80 = 1
@@ -31,11 +27,10 @@ else
 use_cyclone = 1
 endif
 
-DEFINC = -I../.. -I. -DARM -D__GP2X__ -DIN_GP2X # -DBENCHMARK
+DEFINC = -I../.. -I. -DARM -D__GP2X__ -DIN_GP2X -DIN_EVDEV # -DBENCHMARK
 CFLAGS += -Wall -Winline
 ifeq ($(DEBUG),)
-# -ftracer # TODO measure impact
-CFLAGS += -O3 -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math
+CFLAGS += -O3 -fomit-frame-pointer -fstrict-aliasing -ffast-math
 else
 CFLAGS += -ggdb
 endif
@@ -55,15 +50,15 @@ LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy
 
 # frontend
-OBJS += main.o soc.o soc_mmsp2.o soc_pollux.o pollux_set.o emu.o in_gp2x.o plat.o warm.o
+OBJS += plat.o warm.o pollux_set.o soc.o soc_mmsp2.o soc_pollux.o emu.o in_gp2x.o
 # 940 core control
 OBJS += 940ctl.o
 
 # common
 OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \
 	platform/common/arm_utils.o platform/common/arm_linux.o platform/common/readpng.o \
-	platform/common/mp3_helix.o platform/common/input.o \
-	platform/linux/sndout_oss.o platform/linux/plat.o
+	platform/common/mp3_helix.o platform/common/input.o platform/common/main.o \
+	platform/linux/sndout_oss.o platform/linux/plat.o platform/linux/in_evdev.o
 
 # Pico
 ifeq "$(amalgamate)" "1"
@@ -88,11 +83,11 @@ OBJS += pico/sound/sound.o
 endif
 OBJS += pico/sound/mix_arm.o
 OBJS += pico/sound/sn76496.o pico/sound/ym2612.o
+# unzip
+OBJS += unzip/unzip.o unzip/unzip_stream.o
 # zlib
 OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \
 	zlib/deflate.o zlib/crc32.o zlib/adler32.o zlib/zutil.o zlib/compress.o
-# unzip
-OBJS += unzip/unzip.o unzip/unzip_stream.o
 # debug
 ifeq "$(debug_cyclone)" "1"
 OBJS += pico/DebugCPU.o cpu/musashi/m68kdasm.o
@@ -106,7 +101,6 @@ ifeq "$(use_cyclone)" "1"
 DEFINC += -DEMU_C68K
 OBJS += cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o
 endif
-# drz80/mz80
 ifeq "$(mz80)" "1"
 DEFINC += -D_USE_MZ80
 OBJS += cpu/mz80/mz80.o
@@ -118,6 +112,7 @@ endif
 vpath %.c = ../..
 vpath %.s = ../..
 vpath %.S = ../..
+
 DIRS = platform platform/gp2x platform/linux platform/common pico pico/cd pico/pico pico/sound \
 	pico/carthw/svp zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80
 
@@ -126,9 +121,21 @@ all: mkdirs PicoDrive
 
 include ../common/common_arm.mak
 
-PicoDrive : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a
+platform/common/menu.o : revision.h
+
+revision.h:
+	@echo "#define REVISION \"`svn info | grep Revision | cut -c 11-`\"" > /tmp/r.tmp
+	@diff -q $@ /tmp/r.tmp > /dev/null 2>&1 || mv -f /tmp/r.tmp $@
+
+# partial linking helps profiled builds due to section merging
+PicoDrive.o : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a
+	$(LD) -r -o $@ $^
+
+# still using static, dynamic linking slows Wiz 1-10%
+# also libm on F100 is not compatible
+PicoDrive : PicoDrive.o
 	@echo ">>>" $@
-	$(CC) -o $@ $(CFLAGS) $^ -lm -lpng -Wl,-Map=PicoDrive.map
+	$(CC) -static -o $@ $(CFLAGS) $^ -lm -lpng -Wl,-Map=$@.map
 ifeq ($(DEBUG),)
 	$(STRIP) $@
 endif
@@ -151,8 +158,9 @@ $(error need VER)
 endif
 endif
 
-rel: PicoDrive PicoDrive.gpe code940/pico940_v3.bin readme.txt PicoDrive.man.txt PicoDrive.png ../game_def.cfg
-	zip -9 -j ../../PicoDrive_$(VER).zip $^ mmuhack.o
+rel: PicoDrive PicoDrive.gpe code940/pico940_v3.bin readme.txt PicoDrive.png ../game_def.cfg \
+		warm_2.4.25.o warm_2.4.26-open2x.o warm_2.6.24.ko
+	zip -9 -j ../../PicoDrive_$(VER).zip $^
 	zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt
 	mkdir bin_to_cso_mp3
 	cp ../../tools/bin_to_cso_mp3/* bin_to_cso_mp3/