notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
menu: add config save/load
[pcsx_rearmed.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
10614ec
..
3062753
100644
(file)
--- 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
# 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
endif
OBJS += libpcsxcore/new_dynarec/emu_if.o
libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/assem_arm.c
@@
-47,12
+48,15
@@
ifdef X11
LDFLAGS += -lX11 -lXv
OBJS += plugins/dfxvideo/draw.o
else
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
OBJS += plugins/dfxvideo/draw_fb.o
endif
+# cdrcimg
+plugins/cdrcimg/%.o: CFLAGS += -Wall
+OBJS += plugins/cdrcimg/cdrcimg.o
# gui
# 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
OBJS += frontend/main.o frontend/plugin.o frontend/plugin_lib.o
OBJS += frontend/menu.o
@@
-65,7
+69,18
@@
OBJS += frontend/plat_omap.o
else
OBJS += frontend/plat_dummy.o
endif
else
OBJS += frontend/plat_dummy.o
endif
+ifdef PCNT
+CFLAGS += -DPCNT
+endif
frontend/%.o: CFLAGS += -Wall -DIN_EVDEV
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
$(TARGET): $(OBJS)
$(CC) -o $@ $^ $(LDFLAGS) -Wl,-Map=$@.map