X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2FMakefile;h=df197729a38a88ff6928eaacf3a9e8b92c89067d;hb=0aa509f90d056abafd8a9114f11a9ae3df0bfefb;hp=1fa5c8be14a2e7bece839969d261ec5ce66eaca5;hpb=095a240bd91548be4b9770d28d5d6c3e97637094;p=libpicofe.git

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 1fa5c8b..df19772 100644
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -31,20 +31,21 @@ 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 # -DBENCHMARK
+CFLAGS += -Wall -Winline
 ifeq ($(DEBUG),)
-COPT_COMMON += -O3 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math
+# -ftracer # TODO measure impact
+CFLAGS += -O3 -fstrength-reduce -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,14 +55,15 @@ LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy
 
 # frontend
-OBJS += main.o menu.o gp2x.o usbjoy.o emu.o squidgehack.o cpuctrl.o
+OBJS += soc.o soc_mmsp2.o soc_pollux.o pollux_set.o emu.o in_gp2x.o plat.o warm.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/mp3_helix.o platform/common/input.o platform/common/main.o \
+	platform/linux/sndout_oss.o platform/linux/plat.o
 
 # Pico
 ifeq "$(amalgamate)" "1"
@@ -116,26 +118,26 @@ 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
+PicoDrive : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a
 	@echo ">>>" $@
 	$(CC) -o $@ $(CFLAGS) $^ -lm -lpng -Wl,-Map=PicoDrive.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)
 
@@ -149,7 +151,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