sort out 32/64bit savestate compat issues

[pcsx_rearmed.git] / Makefile

diff --git a/Makefile b/Makefile
index e904128..d0e4bef 100644 (file)
--- 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 \
@@ -186,18 +189,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 +200,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 +211,7 @@ frontend/revision.h: FORCE
 %.o: %.S
        $(CC) $(CFLAGS) -c $^ -o $@
 
+
 target_: $(TARGET)
 
 $(TARGET): $(OBJS)