From da710571b75db7031b82924ab3ad47eb645ce215 Mon Sep 17 00:00:00 2001 From: notaz Date: Fri, 30 Nov 2012 02:51:45 +0200 Subject: mave plugin and core shared includes to single location --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 83f343f..493306c 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # default stuff goes here, so that config can override TARGET = pcsx -CFLAGS += -Wall -ggdb -Ifrontend -ffast-math +CFLAGS += -Wall -ggdb -Iinclude -ffast-math LDLIBS += -lpthread ifndef DEBUG CFLAGS += -O2 -DNDEBUG @@ -143,7 +143,7 @@ OBJS += frontend/libpicofe/pandora/plat.o OBJS += frontend/libpicofe/linux/fbdev.o frontend/libpicofe/linux/xenv.o OBJS += frontend/libpicofe/linux/in_evdev.o OBJS += frontend/plat_pandora.o frontend/plat_omap.o -frontend/main.o frontend/menu.o: CFLAGS += -include pandora/ui_feat.h +frontend/main.o frontend/menu.o: CFLAGS += -include frontend/pandora/ui_feat.h USE_PLUGIN_LIB = 1 USE_FRONTEND = 1 endif @@ -152,7 +152,7 @@ OBJS += frontend/libpicofe/gp2x/in_gp2x.o frontend/warm/warm.o OBJS += frontend/libpicofe/gp2x/soc_pollux.o OBJS += frontend/libpicofe/linux/in_evdev.o OBJS += frontend/plat_pollux.o frontend/in_tsbutton.o frontend/blit320.o -frontend/main.o frontend/menu.o: CFLAGS += -include 320240/ui_gp2x.h +frontend/main.o frontend/menu.o: CFLAGS += -include frontend/320240/ui_gp2x.h USE_PLUGIN_LIB = 1 USE_FRONTEND = 1 endif -- cgit v1.2.3 From a1a232ad65a5c15314cbfe753f734a0a3ad6cef5 Mon Sep 17 00:00:00 2001 From: notaz Date: Sun, 2 Dec 2012 02:43:40 +0200 Subject: frontend: fix clean libretro build --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 493306c..0c7854d 100644 --- a/Makefile +++ b/Makefile @@ -192,7 +192,8 @@ endif OBJS += frontend/main.o frontend/plugin.o -frontend/menu.o frontend/main.o frontend/plat_sdl.o: frontend/revision.h +frontend/menu.o frontend/main.o: frontend/revision.h +frontend/plat_sdl.o frontend/libretro.o: frontend/revision.h frontend/libpicofe/%.c: @echo "libpicofe module is missing, please run:" @@ -217,7 +218,7 @@ $(TARGET): $(OBJS) $(CC_LINK) -o $@ $^ $(LDFLAGS) $(LDLIBS) -Wl,-Map=$@.map clean: $(PLAT_CLEAN) clean_plugins - $(RM) $(TARGET) $(OBJS) $(TARGET).map + $(RM) $(TARGET) $(OBJS) $(TARGET).map frontend/revision.h ifneq ($(PLUGINS),) plugins_: $(PLUGINS) -- cgit v1.2.3