From da710571b75db7031b82924ab3ad47eb645ce215 Mon Sep 17 00:00:00 2001 From: notaz Date: Fri, 30 Nov 2012 02:51:45 +0200 Subject: [PATCH] mave plugin and core shared includes to single location --- Makefile | 6 +++--- frontend/menu.c | 2 +- frontend/plugin.c | 2 +- frontend/plugin_lib.c | 2 +- frontend/psemu_plugin_defs.h | 1 - {frontend => include}/config.h | 0 {frontend => include}/pcnt.h | 0 {libpcsxcore => include}/psemu_plugin_defs.h | 0 jni/Android.mk | 2 +- plugins/dfinput/main.h | 2 +- plugins/dfinput/pad.c | 2 +- plugins/dfxvideo/Makefile | 3 +-- plugins/dfxvideo/draw_pl.c | 2 +- plugins/gpu_unai/Makefile | 1 + 14 files changed, 12 insertions(+), 13 deletions(-) delete mode 100644 frontend/psemu_plugin_defs.h rename {frontend => include}/config.h (100%) rename {frontend => include}/pcnt.h (100%) rename {libpcsxcore => include}/psemu_plugin_defs.h (100%) diff --git a/Makefile b/Makefile index 83f343f8..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,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 57c8d17e..7af718e4 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 b0cbc672..7e8e5c3f 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 095d3bed..aa771ed1 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 d4cc29af..00000000 --- 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 similarity index 100% rename from frontend/config.h rename to include/config.h diff --git a/frontend/pcnt.h b/include/pcnt.h similarity index 100% rename from frontend/pcnt.h rename to include/pcnt.h diff --git a/libpcsxcore/psemu_plugin_defs.h b/include/psemu_plugin_defs.h similarity index 100% rename from libpcsxcore/psemu_plugin_defs.h rename to include/psemu_plugin_defs.h diff --git a/jni/Android.mk b/jni/Android.mk index 6be42b1c..98f59f83 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 15d05e72..e83306a6 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 a8019b94..53a254a4 100644 --- a/plugins/dfinput/pad.c +++ b/plugins/dfinput/pad.c @@ -21,7 +21,7 @@ #include -#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 250cc493..580e735c 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 ed07e75f..61fb94c7 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 cf2e5d25..994997fb 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 -- 2.39.5