X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile;h=f195b9b65da86cf75a9387ae3fabd85846996db8;hp=79a8f2deed2703ba7cb34c05b159b7373117ad20;hb=303ee308587f4d2d24047ed5c43de999777cd275;hpb=7139f3c8070e9aa14fd36c2451d7f10079caa37a

diff --git a/Makefile b/Makefile
index 79a8f2de..f195b9b6 100644
--- a/Makefile
+++ b/Makefile
@@ -4,13 +4,16 @@ CC = $(CROSS_COMPILE)gcc
 LD = $(CROSS_COMPILE)ld
 
 CFLAGS += -ggdb -Ifrontend
-LDFLAGS += -lz -lpthread -ldl
+LDFLAGS += -lz -lpthread -ldl -lpng
 ifdef CROSS_COMPILE
 CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfloat-abi=softfp -ffast-math
+ASFLAGS += -mcpu=cortex-a8 -mfpu=neon
 endif
 ifndef DEBUG
-CFLAGS += -O2
+CFLAGS += -O2 # -DNDEBUG
 endif
+#DRC_DBG = 1
+#PCNT = 1
 TARGET = pcsx
 
 all: $(TARGET)
@@ -25,9 +28,14 @@ OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore
 # dynarec
 ifndef NO_NEW_DRC
 OBJS += libpcsxcore/new_dynarec/new_dynarec.o libpcsxcore/new_dynarec/linkage_arm.o
+OBJS += libpcsxcore/new_dynarec/pcsxmem.o
 endif
 OBJS += libpcsxcore/new_dynarec/emu_if.o
 libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/assem_arm.c
+ifdef DRC_DBG
+libpcsxcore/new_dynarec/emu_if.o: CFLAGS += -D_FILE_OFFSET_BITS=64
+CFLAGS += -DDRC_DBG
+endif
 
 # spu
 OBJS += plugins/dfsound/adsr.o plugins/dfsound/dma.o plugins/dfsound/oss.o plugins/dfsound/reverb.o \
@@ -40,19 +48,58 @@ ifdef X11
 LDFLAGS += -lX11 -lXv
 OBJS += plugins/dfxvideo/draw.o
 else
-CFLAGS += -D_MACGL # disables X in dfxvideo
+plugins/dfxvideo/%.o: CFLAGS += -D_MACGL # disables X in dfxvideo
 OBJS += plugins/dfxvideo/draw_fb.o
 endif
+# cdrcimg
+plugins/cdrcimg/%.o: CFLAGS += -Wall
+OBJS += plugins/cdrcimg/cdrcimg.o
 
 # gui
-OBJS += gui/Config.o gui/Plugin.o
+OBJS += gui/Plugin.o
 
 OBJS += frontend/main.o frontend/plugin.o frontend/plugin_lib.o
-OBJS += frontend/linux/fbdev.o
+OBJS += frontend/menu.o
+OBJS += frontend/linux/fbdev.o frontend/linux/in_evdev.o
+OBJS += frontend/linux/plat.o frontend/linux/oshide.o
+OBJS += frontend/common/fonts.o frontend/common/input.o frontend/common/readpng.o
+ifdef CROSS_COMPILE
+OBJS += frontend/arm_utils.o
+OBJS += frontend/plat_omap.o
+else
+OBJS += frontend/plat_dummy.o
+endif
+ifdef PCNT
+CFLAGS += -DPCNT
+endif
+frontend/%.o: CFLAGS += -Wall -DIN_EVDEV
+frontend/menu.o: frontend/revision.h
+
+frontend/revision.h: FORCE
+	@(git describe || echo) | sed -e 's/.*/#define REV "\0"/' > $@_
+	@diff -q $@_ $@ > /dev/null 2>&1 || cp $@_ $@
+	@rm $@_
+.PHONY: FORCE
+
 
 $(TARGET): $(OBJS)
 	$(CC) -o $@ $^ $(LDFLAGS) -Wl,-Map=$@.map
 
+spunull.so: plugins/spunull/spunull.c
+	$(CC) $(CFLAGS) -shared -fPIC -o $@ $^
+
 clean:
 	$(RM) $(TARGET) $(OBJS)
 
+# ----------- release -----------
+
+PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh
+
+VER ?= $(shell git describe --abbrev=0 master)
+
+rel: pcsx pandora/pcsx.sh pandora/pcsx.pxml pandora/pcsx.png \
+		pandora/picorestore pandora/readme.txt skin COPYING
+	rm -rf out
+	mkdir out
+	cp -r $^ out/
+	$(PND_MAKE) -p pcsx_rearmed_$(VER).pnd -d out -x pandora/pcsx.pxml -i pandora/pcsx.png -c