diff options
| author | twinaphex | 2012-12-02 18:06:01 +0100 |
|---|---|---|
| committer | twinaphex | 2012-12-02 18:06:01 +0100 |
| commit | 1cb2b455712a0c9ae814b441a5a46e24e32a808c (patch) | |
| tree | a355bc7e46c9577f358281259e32024100ac6d6a /Makefile | |
| parent | 01f0020f8c4d96ce7ff425c0cab66ad93bf2159c (diff) | |
| parent | a1a232ad65a5c15314cbfe753f734a0a3ad6cef5 (diff) | |
| download | pcsx_rearmed-1cb2b455712a0c9ae814b441a5a46e24e32a808c.tar.gz pcsx_rearmed-1cb2b455712a0c9ae814b441a5a46e24e32a808c.tar.bz2 pcsx_rearmed-1cb2b455712a0c9ae814b441a5a46e24e32a808c.zip | |
Merge git://github.com/notaz/pcsx_rearmed
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -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 @@ -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) |