aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authortwinaphex2012-11-29 01:40:24 +0100
committertwinaphex2012-11-29 01:40:24 +0100
commit01f0020f8c4d96ce7ff425c0cab66ad93bf2159c (patch)
tree35d5f9f27fd33d95e1e005754a41102d3bd56f6b /Makefile
parentb194a2ecd43debbb3724e332b660b993725acd52 (diff)
parentc02c3b656781a406fc4f586ac0923529de186916 (diff)
downloadpcsx_rearmed-01f0020f8c4d96ce7ff425c0cab66ad93bf2159c.tar.gz
pcsx_rearmed-01f0020f8c4d96ce7ff425c0cab66ad93bf2159c.tar.bz2
pcsx_rearmed-01f0020f8c4d96ce7ff425c0cab66ad93bf2159c.zip
Merge git://github.com/notaz/pcsx_rearmed
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 548d8a0..83f343f 100644
--- a/Makefile
+++ b/Makefile
@@ -152,7 +152,6 @@ 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
-libpcsxcore/new_dynarec/pcsxmem.o: CFLAGS += -DCUSTOM_MEMMAPS
frontend/main.o frontend/menu.o: CFLAGS += -include 320240/ui_gp2x.h
USE_PLUGIN_LIB = 1
USE_FRONTEND = 1
@@ -164,7 +163,6 @@ USE_PLUGIN_LIB = 1
endif
ifeq "$(PLATFORM)" "libretro"
OBJS += frontend/libretro.o
-OBJS += frontend/linux/plat_mmap.o
endif
ifeq "$(USE_PLUGIN_LIB)" "1"