X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile;h=b4748fc5d32cacd40b79f0ba1004d7b2f2f5a9cc;hp=7f4d21b04842e0e3aae7216edb95125302f61d20;hb=96d9fde1230e5ae6de069ff9e4a0f16185650ab5;hpb=722285599b1ce45ca435f484b0f34a5e568487a1

diff --git a/Makefile b/Makefile
index 7f4d21b0..b4748fc5 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
@@ -47,9 +48,12 @@ 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
@@ -69,6 +73,14 @@ 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