X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile;h=2e67178d78de302d8dff509a183b1b950df75bfe;hp=833dddc35f61f05e323a9a066a355888b090927c;hb=a1b44e3650691750cff4bf1c5bc04a36c3e8066d;hpb=cc56203b76e1fcef2c7e55b460daf07e654a1547

diff --git a/Makefile b/Makefile
index 833dddc3..2e67178d 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,11 @@ endif
 -include Makefile.local
 
 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 \
@@ -140,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
@@ -149,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
@@ -185,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:
@@ -204,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
 
@@ -216,6 +213,7 @@ frontend/revision.h: FORCE
 %.o: %.S
 	$(CC) $(CFLAGS) -c $^ -o $@
 
+
 target_: $(TARGET)
 
 $(TARGET): $(OBJS)