mave plugin and core shared includes to single location

14 files changed, 12 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index 83f343f..493306c 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,7 +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
-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
diff --git a/frontend/menu.c b/frontend/menu.c
index 57c8d17..7af718e 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -32,10 +32,10 @@
 #include "../libpcsxcore/cdrom.h"
 #include "../libpcsxcore/cdriso.h"
 #include "../libpcsxcore/cheat.h"
-#include "../libpcsxcore/psemu_plugin_defs.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../plugins/dfinput/externals.h"
 #include "../plugins/gpulib/cspace.h"
+#include "psemu_plugin_defs.h"
 #include "revision.h"
 
 #define REARMED_BIRTHDAY_TIME 1293306830	/* 25 Dec 2010 */
diff --git a/frontend/plugin.c b/frontend/plugin.c
index b0cbc67..7e8e5c3 100644
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -11,7 +11,7 @@
 
 #include "plugin_lib.h"
 #include "plugin.h"
-#include "../libpcsxcore/psemu_plugin_defs.h"
+#include "psemu_plugin_defs.h"
 #include "../libpcsxcore/system.h"
 #include "../plugins/cdrcimg/cdrcimg.h"
 
diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index 095d3be..aa771ed 100644
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -28,8 +28,8 @@
 #include "plat.h"
 #include "pcnt.h"
 #include "pl_gun_ts.h"
+#include "psemu_plugin_defs.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
-#include "../libpcsxcore/psemu_plugin_defs.h"
 #include "../libpcsxcore/psxmem_map.h"
 #include "../plugins/gpulib/cspace.h"
 #include "../plugins/dfinput/externals.h"
diff --git a/frontend/psemu_plugin_defs.h b/frontend/psemu_plugin_defs.h
deleted file mode 100644
index d4cc29a..0000000
--- a/frontend/psemu_plugin_defs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../libpcsxcore/psemu_plugin_defs.h"
diff --git a/frontend/config.h b/include/config.h
index dcfb598..dcfb598 100644
--- a/frontend/config.h
+++ b/include/config.h
diff --git a/frontend/pcnt.h b/include/pcnt.h
index 9ddd500..9ddd500 100644
--- a/frontend/pcnt.h
+++ b/include/pcnt.h
diff --git a/libpcsxcore/psemu_plugin_defs.h b/include/psemu_plugin_defs.h
index 3926ccd..3926ccd 100644
--- a/libpcsxcore/psemu_plugin_defs.h
+++ b/include/psemu_plugin_defs.h
diff --git a/jni/Android.mk b/jni/Android.mk
index 6be42b1..98f59f8 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -98,7 +98,7 @@ LOCAL_SRC_FILES += ../frontend/linux/plat.c
 LOCAL_SRC_FILES += ../frontend/libretro.c
 
 LOCAL_CFLAGS += -O3 -ffast-math -funroll-loops -DNDEBUG -D_FILE_OFFSET_BITS=64 -DHAVE_LIBRETRO -DNO_FRONTEND
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../frontend
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include
 LOCAL_LDLIBS := -lz -llog
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/plugins/dfinput/main.h b/plugins/dfinput/main.h
index 15d05e7..e83306a 100644
--- a/plugins/dfinput/main.h
+++ b/plugins/dfinput/main.h
@@ -1,4 +1,4 @@
-#include "../../libpcsxcore/psemu_plugin_defs.h"
+#include "psemu_plugin_defs.h"
 #include "externals.h"
 
 extern unsigned char CurPad, CurByte, CurCmd, CmdLen;
diff --git a/plugins/dfinput/pad.c b/plugins/dfinput/pad.c
index a8019b9..53a254a 100644
--- a/plugins/dfinput/pad.c
+++ b/plugins/dfinput/pad.c
@@ -21,7 +21,7 @@
 
 #include <stdint.h>
 
-#include "../../libpcsxcore/psemu_plugin_defs.h"
+#include "psemu_plugin_defs.h"
 #include "main.h"
 
 enum {
diff --git a/plugins/dfxvideo/Makefile b/plugins/dfxvideo/Makefile
index 250cc49..580e735 100644
--- a/plugins/dfxvideo/Makefile
+++ b/plugins/dfxvideo/Makefile
@@ -1,7 +1,6 @@
 CFLAGS += -Wall -ggdb -O2
 CFLAGS += -fno-strict-aliasing -ffast-math
-# ugh
-CFLAGS += -I../../libpcsxcore
+CFLAGS += -I../../include
 
 include ../../config.mak
 
diff --git a/plugins/dfxvideo/draw_pl.c b/plugins/dfxvideo/draw_pl.c
index ed07e75..61fb94c 100644
--- a/plugins/dfxvideo/draw_pl.c
+++ b/plugins/dfxvideo/draw_pl.c
@@ -11,7 +11,7 @@
 
 #include "../gpulib/cspace.h"
 #include "../../frontend/plugin_lib.h"
-#include "../../frontend/pcnt.h"
+#include "pcnt.h"
 
 // misc globals
 long           lLowerpart;
diff --git a/plugins/gpu_unai/Makefile b/plugins/gpu_unai/Makefile
index cf2e5d2..994997f 100644
--- a/plugins/gpu_unai/Makefile
+++ b/plugins/gpu_unai/Makefile
@@ -1,5 +1,6 @@
 CFLAGS += -ggdb -Wall -O3 -ffast-math
 CFLAGS += -DREARMED
+CFLAGS += -I../../include
 
 include ../../config.mak