X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2FMakefile;h=54c806a44c14e9c9ff92f7e1e0f426b90a625388;hb=f71361b521c9c64351ea99ed97627a606c642008;hp=01dbaf4ad6bcb49a69d34011c21d6ac088463ba4;hpb=fa5e045bdc817112c1abf19e65e2d3481d51c48a;p=libpicofe.git

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 01dbaf4..54c806a 100644
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -14,7 +14,7 @@ asm_misc = 1
 asm_cdpico = 1
 asm_cdmemory = 1
 amalgamate = 0
-#profile = 1
+profile = 2
 #use_musashi = 1
 #up = 1
 
@@ -31,21 +31,21 @@ else
 use_cyclone = 1
 endif
 
-DEFINC = -I../.. -I. -DARM -D__GP2X__ -DIN_GP2X # -DBENCHMARK
-COPT_COMMON = -Wall -Winline
-COPT_COMMON += -static
+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
+# -ftracer -fstrength-reduce # TODO measure impact
+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
@@ -55,22 +55,23 @@ LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy
 
 # frontend
-OBJS += main.o soc.o soc_mmsp2.o soc_pollux.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
+OBJS += platform/common/emu.o platform/common/input.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/main.o \
+	platform/linux/sndout_oss.o platform/linux/plat.o platform/linux/in_evdev.o
 
 # Pico
 ifeq "$(amalgamate)" "1"
 OBJS += ../../picoAll.o
 else
-OBJS += pico/area.o pico/cart.o pico/memory.o pico/misc.o pico/pico.o pico/sek.o \
-		pico/videoport.o pico/draw2.o pico/draw.o pico/patch.o pico/debug.o
+OBJS += pico/memory.o pico/videoport.o pico/draw.o pico/draw2.o pico/pico.o pico/sek.o \
+		pico/area.o pico/cart.o pico/misc.o pico/patch.o pico/debug.o
 # Pico - CD
 OBJS += pico/cd/pico.o pico/cd/memory.o pico/cd/sek.o pico/cd/LC89510.o \
 		pico/cd/cd_sys.o pico/cd/cd_file.o pico/cd/cue.o pico/cd/gfx_cd.o \
@@ -88,24 +89,15 @@ 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
 endif
-# CPU cores
-ifeq "$(use_musashi)" "1"
-DEFINC += -DEMU_M68K
-OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o
-endif
-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
@@ -114,6 +106,14 @@ else
 DEFINC += -D_USE_DRZ80
 OBJS += cpu/DrZ80/drz80.o
 endif
+ifeq "$(use_musashi)" "1"
+DEFINC += -DEMU_M68K
+OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o
+endif
+ifeq "$(use_cyclone)" "1"
+DEFINC += -DEMU_C68K
+OBJS += cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o
+endif
 
 vpath %.c = ../..
 vpath %.s = ../..
@@ -122,22 +122,34 @@ DIRS = platform platform/gp2x platform/linux platform/common pico pico/cd pico/p
 	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_dyn PicoDrive_sta
 
 include ../common/common_arm.mak
 
-PicoDrive.gpe : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a
+PicoDrive.o : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a
+	$(LD) -r -o $@ $^
+
+PicoDrive_dyn : PicoDrive.o
+	@echo ">>>" $@
+	$(CC) -o $@ $(CFLAGS) $^ -Wl,-Bstatic -lm -Wl,-Bdynamic -lpng -Wl,-Map=$@.map
+ifeq ($(DEBUG),)
+	$(STRIP) $@
+endif
+#	$(CC) -o $@ $(CFLAGS) $^ -lm -lpng -Wl,-Map=$@.map
+#	$(CC) -o $@ $(CFLAGS) $^ -Wl,-Bstatic -lm -Wl,-Bdynamic -lpng -Wl,-Map=$@.map
+
+PicoDrive_sta : 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)
 
@@ -151,7 +163,7 @@ $(error need VER)
 endif
 endif
 
-rel: PicoDrive.gpe code940/pico940_v3.bin readme.txt PicoDrive.man.txt PicoDrive.png ../game_def.cfg
+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
 	zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt
 	mkdir bin_to_cso_mp3