X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=Makefile.gp2x;h=05908ae0605b8d8aca321d1d5965d1db4d69105d;hp=4b1553ad88efd896310b9fa2efb9a4d7d63814d2;hb=7b356ee3dc5d7e54d9dc06c413f84380d1044441;hpb=9115e7d2b5e5b8dc00774fe92db97f1d02b2fee1

diff --git a/Makefile.gp2x b/Makefile.gp2x
index 4b1553a..05908ae 100644
--- a/Makefile.gp2x
+++ b/Makefile.gp2x
@@ -1,38 +1,87 @@
-CC	= arm-linux-gcc
-STRIP	= arm-linux-strip
-TFLAGS  = -mcpu=arm920t -Izlib -DGP2X=1 -DLSB_FIRST -DUNIX -DPSS_STYLE=1 -DZLIB -DFRAMESKIP -D_REENTRANT
+CROSS	= arm-linux-
+CC	= $(CROSS)gcc
+STRIP	= $(CROSS)strip
+AS	= $(CROSS)as
+TFLAGS  = -Winline -mcpu=arm920t -Izlib -DGP2X=1 -DLSB_FIRST -DUNIX -DPSS_STYLE=1 -DHAVE_ASPRINTF -DZLIB -DFRAMESKIP -D_REENTRANT
+ASFLAGS	= -mcpu=arm920t -mfloat-abi=soft
 RM	= rm -f
 B	= drivers/gp2x/
 ifdef DEBUG
 TFLAGS	+= -ggdb
+LDRIVER	+= -ggdb
+NOSTRIP = 1
 else
-TFLAGS	+= -O3
+TFLAGS	+= -ftracer -fstrength-reduce -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math
+TFLAGS	+= -O3 #-pg -fno-omit-frame-pointer
+LDRIVER	+= -O3 #-pg -fno-omit-frame-pointer
 endif
 
+#NOSTRIP = 1
+
+asm_6502=1
+#debug_asm_6502=1
+
 all:		fceu
 
-gpfce: fceu
-	cp fceu gpfce
+gpfce.gpe: fceu
+	cp fceu $@
 
 include zlib/Makefile
 
-OBJDRIVER	= ${B}minimal.o ${B}gp2x.o ${B}main.o ${B}throttle.o ${B}unix-netplay.o ${B}gp2x-sound.o ${B}gp2x-video.o ${B}lnx-joystick.o drivers/common/cheat.o drivers/common/config.o drivers/common/args.o drivers/common/vidblit.o ${UNZIPOBJS} ppu.o
-LDRIVER		= -L /mnt/sd/lib  -L/mnt/sd/gp2x/usr/lib -lm -lz -static
+OBJDRIVER	 = ${B}minimal.o ${B}cpuctrl.o ${B}squidgehack.o ${B}asmutils.o ${B}gp2x.o ${B}main.o ${B}throttle.o \
+		${B}unix-netplay.o ${B}gp2x-sound.o ${B}gp2x-video.o ${B}usbjoy.o ${B}menu.o ${B}fonts.o ${B}readpng.o \
+		drivers/common/cheat.o drivers/common/config.o drivers/common/args.o drivers/common/vidblit.o ${UNZIPOBJS} ppu.o movie.o
+LDRIVER		+= -lm -lz -lpng -static -Wl,-Map=fceu.map
+
+ifeq ($(asm_6502),1)
+TFLAGS  += -DASM_6502
+OBJDRIVER += ncpu.o
+ifeq ($(debug_asm_6502),1)
+TFLAGS  += -DDEBUG_ASM_6502
+OBJDRIVER += x6502.o ncpu_debug.o
+endif
+else
+OBJDRIVER += x6502.o
+endif
+
+x6502.o: x6502.c x6502.h ops.h fce.h sound.h dprintf.h
+
+ncpu.o: ncpu.S ncpu.h
+	$(CC) $(TFLAGS) -c $< -o $@
 
 include Makefile.base
 
-${B}lnx-joystick.o:	${B}lnx-joystick.c
 ${B}main.o:		${B}main.c ${B}main.h ${B}usage.h ${B}input.c
-${B}gp2x.o:		${B}gp2x.c ${B}gp2x.h
-${B}gp2x-video.o:	${B}gp2x-video.c
-${B}gp2x-video.o:	${B}minimal.c
-${B}gp2x-sound.o:	${B}gp2x-sound.c
-${B}unix-netplay.o:	${B}unix-netplay.c
+${B}gp2x.o:		${B}gp2x.c ${B}gp2x.h ${B}rev.h
 ${B}throttle.o:         ${B}throttle.c ${B}main.h ${B}throttle.h
 ppu.o:			ppu.c ppu.h
 
+${B}rev.h: FORCE
+	@if [ -f $@ ]; then prevrev=`cat $@`; else prevrev="00"; fi; \
+	if [ "`which svn`" != "" ]; then \
+		rev=`svn update|tail -n 1|sed 's/.*\ \(.*\)\./\1/g'|sed "s/'//g"`; \
+	fi; \
+	if [ "$$rev"  = "" ]; then rev="0"; fi; \
+	if [ "$$rev" != "$$prevrev" ]; then \
+		echo "$$rev" > $@; \
+	fi
+
+.PHONY: FORCE
+
 include Makefile.common
 
 up: fceu
-	cp -v fceu /mnt/gp2x/mnt/sd/emus/Gpfce_v02/gpfce
+	cp -v fceu /mnt/gp2x/mnt/sd/emus/gpfce/gpfce.gpe
+
+# ----------- release -----------
+ifneq ($(findstring rel,$(MAKECMDGOALS)),)
+ifeq ($(VER),)
+$(error need VER)
+endif
+endif
+
+rel: gpfce.gpe out_gp2x/readme.txt out_gp2x/gpfce.man.txt out_gp2x/gpfce.png out_gp2x/background.png
+	zip -9 -j gpfce_v$(VER).zip $^ drivers/gp2x/mmuhack.o
+	zip -9 gpfce_v$(VER).zip fceultra
+