X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2FMakefile;h=6e899f245f9be2195dd66d47786395528ce61997;hb=490eb4805c9dd8fd358c96dc7e646a6db74e2dfb;hp=b8bf4482fff6a5e29d8629a41de3f855f639c1d7;hpb=efcba75f8a730340df6c1b679a207723f98d1ee6;p=picodrive.git

diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index b8bf448..6e899f2 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,20 +27,20 @@ else
 use_cyclone = 1
 endif
 
-DEFINC = -I../.. -I. -DARM -D__GP2X__ # -DBENCHMARK
-COPT_COMMON = -static -Wall -Winline
+DEFINC = -I../.. -I. -DARM -D__GP2X__ -DIN_GP2X -DIN_EVDEV # -DBENCHMARK
+CFLAGS += -Wall -Winline
 ifeq ($(DEBUG),)
-COPT_COMMON += -O3 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math
+CFLAGS += -O3 -fomit-frame-pointer -fstrict-aliasing -ffast-math
 else
-COPT_COMMON += -ggdb
+CFLAGS += -ggdb
 endif
 ifeq "$(profile)" "1"
-COPT_COMMON += -fprofile-generate
+CFLAGS += -fprofile-generate
 endif
 ifeq "$(profile)" "2"
-COPT_COMMON += -fprofile-use
+CFLAGS += -fprofile-use
 endif
-CFLAGS = $(COPT_COMMON) -mcpu=arm920t -mtune=arm920t
+CFLAGS += -mcpu=arm920t -mtune=arm920t
 SFLAGS = $(CFLAGS)
 ASFLAGS = -mcpu=arm920t -mfloat-abi=soft
 CC = $(CROSS)gcc
@@ -54,13 +50,15 @@ LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy
 
 # frontend
-OBJS += main.o menu.o gp2x.o usbjoy.o emu.o squidgehack.o cpuctrl.o asm_utils.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/readpng.o platform/common/mp3_helix.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/common/main.o \
+	platform/linux/sndout_oss.o platform/linux/plat.o platform/linux/in_evdev.o
 
 # Pico
 ifeq "$(amalgamate)" "1"
@@ -85,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
@@ -103,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
@@ -115,26 +112,33 @@ endif
 vpath %.c = ../..
 vpath %.s = ../..
 vpath %.S = ../..
-DIRS = platform platform/gp2x 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
+
+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
 
 
-all: mkdirs PicoDrive.gpe
+all: mkdirs PicoDrive
 
 include ../common/common_arm.mak
 
-PicoDrive.gpe : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a
+# 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
 
-up: PicoDrive.gpe
-	@cp -v PicoDrive.gpe /mnt/gp2x/mnt/sd/emus/PicoDrive/
+up: PicoDrive
+	@cp -v PicoDrive /mnt/gp2x/mnt/sd/emus/PicoDrive/
 
 clean: tidy
-	$(RM) PicoDrive.gpe
+	$(RM) PicoDrive
 tidy:
 	$(RM) $(OBJS)
 
@@ -148,8 +152,9 @@ $(error need VER)
 endif
 endif
 
-rel: 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/