X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile;h=63241e581f3cb1305c7a78a20bf49595c16ee55b;hp=2ccd0e2a84a2813af2e47f15dd494c9bbafc9e56;hb=f51dc36c05395bf077ff3b76452f36477581c8e1;hpb=e0c692d9417fdea51a1deebda1048d1a91f1270f diff --git a/Makefile b/Makefile index 2ccd0e2a..63241e58 100644 --- a/Makefile +++ b/Makefile @@ -72,11 +72,16 @@ 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" OBJS += maemo/hildon.o maemo/main.o maemo/%.o: maemo/%.c +maemo/%.o: CFLAGS += -Wall else OBJS += frontend/plugin_lib.o frontend/menu.o OBJS += frontend/linux/fbdev.o frontend/linux/in_evdev.o @@ -84,6 +89,7 @@ OBJS += frontend/linux/plat.o frontend/linux/oshide.o OBJS += frontend/common/fonts.o frontend/common/input.o frontend/common/readpng.o ifeq "$(ARCH)" "arm" OBJS += frontend/plat_omap.o +OBJS += frontend/pandora.o else OBJS += frontend/plat_dummy.o endif @@ -128,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 \