X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile;h=2e67178d78de302d8dff509a183b1b950df75bfe;hp=e904128be48c90dfa5441e6e5e8c8648bce5bf60;hb=d5c08ed34ac422bafb933eed8ef5a30e8ed2dc5e;hpb=22fa3f2b3d09f3694f938ca895d447a30ec96f25

diff --git a/Makefile b/Makefile
index e904128b..2e67178d 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,9 @@ endif
 CC_LINK = $(CC)
 LDFLAGS += $(MAIN_LDFLAGS)
 LDLIBS += $(MAIN_LDLIBS)
+ifdef PCNT
+CFLAGS += -DPCNT
+endif
 
 # core
 OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore/debug.o \
@@ -141,6 +144,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
 USE_PLUGIN_LIB = 1
 USE_FRONTEND = 1
 endif
@@ -150,6 +154,7 @@ 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
 endif
@@ -186,18 +191,10 @@ else
 CFLAGS += -DNO_FRONTEND
 endif
 
-ifdef X11
-frontend/%.o: CFLAGS += -DX11
-OBJS += frontend/xkb.o
-endif
-ifdef PCNT
-CFLAGS += -DPCNT
-endif
-
 # misc
 OBJS += frontend/main.o frontend/plugin.o
 
-frontend/%.o: CFLAGS += -DIN_EVDEV
+
 frontend/menu.o frontend/main.o frontend/plat_sdl.o: frontend/revision.h
 
 frontend/libpicofe/%.c:
@@ -205,7 +202,6 @@ frontend/libpicofe/%.c:
 	@echo "git submodule init && git submodule update"
 	@exit 1
 
-
 libpcsxcore/gte_nf.o: libpcsxcore/gte.c
 	$(CC) -c -o $@ $^ $(CFLAGS) -DFLAGLESS
 
@@ -217,6 +213,7 @@ frontend/revision.h: FORCE
 %.o: %.S
 	$(CC) $(CFLAGS) -c $^ -o $@
 
+
 target_: $(TARGET)
 
 $(TARGET): $(OBJS)