X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile;h=493306cf6ab618c987b649a72dfedde38a15ee6e;hp=548d8a0590911a17211193eb28b6405708e95df1;hb=89f33b734d7d540c7fa26f6556ef9ec49eb3008a;hpb=eac3852265815a2e57ea9987a2bea2fcadd3f022 diff --git a/Makefile b/Makefile index 548d8a05..493306cf 100644 --- a/Makefile +++ b/Makefile @@ -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,8 +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 -libpcsxcore/new_dynarec/pcsxmem.o: CFLAGS += -DCUSTOM_MEMMAPS -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 @@ -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"