X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile;h=2602abbdb9cc29cb1d7eef03c660918265dd0cfe;hp=b712718ba65c5f4d32e009bd8b195b1834e0e420;hb=a96a5eb2d6a6720cc7bba6a30d1c25473f345a89;hpb=47bf65ab6163fb70eb2ad309c9487229832bcaed

diff --git a/Makefile b/Makefile
index b712718b..2602abbd 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,7 @@ 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
@@ -41,13 +42,12 @@ OBJS += plugins/dfsound/adsr.o plugins/dfsound/dma.o plugins/dfsound/oss.o plugi
 	plugins/dfsound/xa.o plugins/dfsound/freeze.o plugins/dfsound/cfg.o plugins/dfsound/registers.o \
 	plugins/dfsound/spu.o
 # gpu
-OBJS += plugins/dfxvideo/cfg.o plugins/dfxvideo/fps.o plugins/dfxvideo/key.o plugins/dfxvideo/prim.o \
-	plugins/dfxvideo/gpu.o plugins/dfxvideo/menu.o plugins/dfxvideo/soft.o plugins/dfxvideo/zn.o
+plugins/dfxvideo/%.o: CFLAGS += -Wall
+OBJS += plugins/dfxvideo/gpu.o
 ifdef X11
 LDFLAGS += -lX11 -lXv
 OBJS += plugins/dfxvideo/draw.o
 else
-plugins/dfxvideo/%.o: CFLAGS += -D_MACGL # disables X in dfxvideo
 OBJS += plugins/dfxvideo/draw_fb.o
 endif
 # cdrcimg
@@ -55,7 +55,7 @@ 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/menu.o
@@ -85,8 +85,25 @@ $(TARGET): $(OBJS)
 	$(CC) -o $@ $^ $(LDFLAGS) -Wl,-Map=$@.map
 
 spunull.so: plugins/spunull/spunull.c
-	$(CC) $(CFLAGS) -shared -fPIC -o $@ $^
+	$(CC) $(CFLAGS) -shared -fPIC -ggdb -O2 -o $@ $^
+
+plugins/gpu-gles/gpuGLES.so:
+	make -C plugins/gpu-gles/
 
 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 spunull.so plugins/gpu-gles/gpuGLES.so \
+		pandora/pcsx.sh pandora/pcsx.pxml pandora/pcsx.png \
+		pandora/picorestore pandora/readme.txt skin COPYING
+	rm -rf out
+	mkdir -p out/plugins
+	cp -r $^ out/
+	mv out/*.so out/plugins/
+	$(PND_MAKE) -p pcsx_rearmed_$(VER).pnd -d out -x pandora/pcsx.pxml -i pandora/pcsx.png -c