main.c: load savestate after prepare

[pcsx_rearmed.git] / Makefile

diff --git a/Makefile b/Makefile
index db8e1f6..63241e5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -72,6 +72,10 @@ endif
 plugins/cdrcimg/%.o: CFLAGS += -Wall
 OBJS += plugins/cdrcimg/cdrcimg.o
 
+# dfinput
+plugins/dfinput/%.o: CFLAGS += -Wall
+OBJS += plugins/dfinput/pad.o
+
 # gui
 OBJS += frontend/main.o frontend/plugin.o 
 ifeq "$(USE_GTK)" "1"
@@ -130,7 +134,7 @@ clean_plugins:
 
 PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh
 
-VER ?= $(shell git describe --abbrev=0 master)
+VER ?= $(shell git describe master)
 
 rel: pcsx $(PLUGINS) \
                pandora/pcsx.sh pandora/pcsx.pxml pandora/pcsx.png \