removed 64bit stuff in sound.c

[fceu.git] / Makefile.gp2x

diff --git a/Makefile.gp2x b/Makefile.gp2x
index af7d4ae..6b82e47 100644 (file)
--- a/Makefile.gp2x
+++ b/Makefile.gp2x
@@ -9,12 +9,15 @@ B     = drivers/gp2x/
 ifdef DEBUG
 TFLAGS += -ggdb
 LDRIVER        += -ggdb
+NOSTRIP = 1
 else
 TFLAGS += -ftracer -fstrength-reduce -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math
-TFLAGS += -O3 # -pg
-LDRIVER        += -O3 # -pg
+TFLAGS += -O3 #-pg -fno-omit-frame-pointer
+LDRIVER        += -O3 #-pg -fno-omit-frame-pointer
 endif
 
+#NOSTRIP = 1
+
 asm_6502=1
 #debug_asm_6502=1
 
@@ -25,10 +28,10 @@ gpfce: fceu
 
 include zlib/Makefile
 
-OBJDRIVER       = ${B}minimal.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}lnx-joystick.o \
+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}lnx-joystick.o ${B}usbjoy.o ${B}menu.o ${B}fonts.o \
                drivers/common/cheat.o drivers/common/config.o drivers/common/args.o drivers/common/vidblit.o ${UNZIPOBJS} ppu.o movie.o
-LDRIVER                += -L /mnt/sd/lib  -L/mnt/sd/gp2x/usr/lib -lm -lz -static -Wl,-Map=fceu.map
+LDRIVER                += -L /mnt/sd/lib -L/mnt/sd/gp2x/usr/lib -lm -lz -static -Wl,-Map=fceu.map
 
 ifeq ($(asm_6502),1)
 TFLAGS  += -DASM_6502
@@ -51,12 +54,22 @@ include Makefile.base
 ${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}throttle.o:         ${B}throttle.c ${B}main.h ${B}throttle.h
+${B}menu.o:            ${B}rev.h
 ppu.o:                 ppu.c ppu.h
 
-include Makefile.common
+${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
 
-#x6502.o:      x6502.c x6502.h ops.h fce.h sound.h
-#      $(CC) $(CFLAGS) -finline-limit=60000 -c $< -o $@
+.PHONY: FORCE
+
+include Makefile.common
 
 up: fceu
        cp -v fceu /mnt/gp2x/mnt/sd/emus/Gpfce_v02/gpfce