From 77aa7535c935eebf294eb8325824f3d2476403ce Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 10 Aug 2015 23:11:40 +0200 Subject: [PATCH] MOve all 'define' headers to central place ' defines' --- audio/drivers/gx_audio.c | 2 +- audio/drivers/ps3_audio.c | 2 +- gfx/drivers/gx_sdk_defines.h => defines/gx_defines.h | 4 ++-- ps3/sdk_defines.h => defines/ps3_defines.h | 4 ++-- gfx/drivers/psp_sdk_defines.h => defines/psp_defines.h | 4 ++-- frontend/drivers/platform_gx.c | 2 +- frontend/drivers/platform_ps3.c | 2 +- frontend/drivers/platform_psp.c | 2 +- gfx/drivers/gx_gfx.c | 2 +- gfx/drivers/psp1_gfx.c | 2 +- gfx/drivers_context/ps3_ctx.c | 2 +- gfx/image/image.c | 2 +- input/drivers/ps3_input.c | 2 +- input/drivers/psp_input.c | 2 +- logger/netlogger/logger.c | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-) rename gfx/drivers/gx_sdk_defines.h => defines/gx_defines.h (95%) rename ps3/sdk_defines.h => defines/ps3_defines.h (99%) rename gfx/drivers/psp_sdk_defines.h => defines/psp_defines.h (98%) diff --git a/audio/drivers/gx_audio.c b/audio/drivers/gx_audio.c index 35606cdbb3..566d6af4c8 100644 --- a/audio/drivers/gx_audio.c +++ b/audio/drivers/gx_audio.c @@ -28,7 +28,7 @@ #include #endif -#include "../../gfx/drivers/gx_sdk_defines.h" +#include "../../defines/gx_defines.h" #define CHUNK_FRAMES 64 #define CHUNK_SIZE (CHUNK_FRAMES * sizeof(uint32_t)) diff --git a/audio/drivers/ps3_audio.c b/audio/drivers/ps3_audio.c index f03dc08ad9..eb8acbf71d 100644 --- a/audio/drivers/ps3_audio.c +++ b/audio/drivers/ps3_audio.c @@ -21,7 +21,7 @@ #include #include -#include "../ps3/sdk_defines.h" +#include "../../defines/ps3_defines.h" #define AUDIO_BLOCKS 8 #define AUDIO_CHANNELS 2 diff --git a/gfx/drivers/gx_sdk_defines.h b/defines/gx_defines.h similarity index 95% rename from gfx/drivers/gx_sdk_defines.h rename to defines/gx_defines.h index a87df74051..194b315c31 100644 --- a/gfx/drivers/gx_sdk_defines.h +++ b/defines/gx_defines.h @@ -1,5 +1,5 @@ -#ifndef _GX_SDK_DEFINES_H -#define _GX_SDK_DEFINES_H +#ifndef _GX_DEFINES_H +#define _GX_DEFINES_H #ifdef GEKKO diff --git a/ps3/sdk_defines.h b/defines/ps3_defines.h similarity index 99% rename from ps3/sdk_defines.h rename to defines/ps3_defines.h index 4e6ff9230c..cdd4cee7df 100644 --- a/ps3/sdk_defines.h +++ b/defines/ps3_defines.h @@ -14,8 +14,8 @@ * If not, see . */ -#ifndef _PS3_SDK_DEFINES_H -#define _PS3_SDK_DEFINES_H +#ifndef _PS3_DEFINES_H +#define _PS3_DEFINES_H #include diff --git a/gfx/drivers/psp_sdk_defines.h b/defines/psp_defines.h similarity index 98% rename from gfx/drivers/psp_sdk_defines.h rename to defines/psp_defines.h index 51759c0264..3b42183208 100644 --- a/gfx/drivers/psp_sdk_defines.h +++ b/defines/psp_defines.h @@ -14,8 +14,8 @@ * If not, see . */ -#ifndef _PSP_SDK_DEFINES_H -#define _PSP_SDK_DEFINES_H +#ifndef _PSP_DEFINES_H +#define _PSP_DEFINES_H /*============================================================ ERROR PROTOTYPES diff --git a/frontend/drivers/platform_gx.c b/frontend/drivers/platform_gx.c index 3a90cf7f24..936c3c4941 100644 --- a/frontend/drivers/platform_gx.c +++ b/frontend/drivers/platform_gx.c @@ -43,7 +43,7 @@ #include "../../driver.h" #include "../../general.h" #include "../../libretro_private.h" -#include "../../gfx/drivers/gx_sdk_defines.h" +#include "../../defines/gx_defines.h" #ifdef HW_RVL #include diff --git a/frontend/drivers/platform_ps3.c b/frontend/drivers/platform_ps3.c index 12ae4aafbd..3f933cf328 100644 --- a/frontend/drivers/platform_ps3.c +++ b/frontend/drivers/platform_ps3.c @@ -33,7 +33,7 @@ #include #endif -#include "../../ps3/sdk_defines.h" +#include "../../defines/ps3_defines.h" #include "../../general.h" #define EMULATOR_CONTENT_DIR "SSNE10000" diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c index 6240c1b392..4cef58ede6 100644 --- a/frontend/drivers/platform_psp.c +++ b/frontend/drivers/platform_psp.c @@ -30,7 +30,7 @@ #include #endif -#include "../../gfx/drivers/psp_sdk_defines.h" +#include "../../defines/psp_defines.h" #include "../../general.h" #if defined(HAVE_KERNEL_PRX) || defined(IS_SALAMANDER) diff --git a/gfx/drivers/gx_gfx.c b/gfx/drivers/gx_gfx.c index 1f042bbc23..ead38099fe 100644 --- a/gfx/drivers/gx_gfx.c +++ b/gfx/drivers/gx_gfx.c @@ -35,7 +35,7 @@ #include "ppc_asm.h" #include "gx_gfx_inl.h" -#include "gx_sdk_defines.h" +#include "../../defines/gx_defines.h" struct gx_overlay_data { diff --git a/gfx/drivers/psp1_gfx.c b/gfx/drivers/psp1_gfx.c index 2dc6e2f4c7..f38bf8d80a 100644 --- a/gfx/drivers/psp1_gfx.c +++ b/gfx/drivers/psp1_gfx.c @@ -22,7 +22,7 @@ #include #include -#include "psp_sdk_defines.h" +#include "../../defines/psp_defines.h" #include "../../general.h" #include "../../driver.h" #include "../video_viewport.h" diff --git a/gfx/drivers_context/ps3_ctx.c b/gfx/drivers_context/ps3_ctx.c index 1689abb2a9..88957e7e64 100644 --- a/gfx/drivers_context/ps3_ctx.c +++ b/gfx/drivers_context/ps3_ctx.c @@ -16,7 +16,7 @@ #include "../../driver.h" #include "../../runloop.h" -#include "../../ps3/sdk_defines.h" +#include "../../defines/ps3_defines.h" #ifdef HAVE_LIBDBGFONT #ifndef __PSL1GHT__ diff --git a/gfx/image/image.c b/gfx/image/image.c index 97d431843f..7e73aad878 100644 --- a/gfx/image/image.c +++ b/gfx/image/image.c @@ -36,7 +36,7 @@ #include "../../general.h" #if defined(__CELLOS_LV2__) || defined(__PSLIGHT__) -#include "../../ps3/sdk_defines.h" +#include "../../defines/ps3_defines.h" #ifdef __PSL1GHT__ #include diff --git a/input/drivers/ps3_input.c b/input/drivers/ps3_input.c index ef3f204a0d..fc82240296 100644 --- a/input/drivers/ps3_input.c +++ b/input/drivers/ps3_input.c @@ -21,7 +21,7 @@ #include -#include "../../ps3/sdk_defines.h" +#include "../../defines/ps3_defines.h" #include "../../driver.h" #include "../../libretro.h" diff --git a/input/drivers/psp_input.c b/input/drivers/psp_input.c index f3e9481bc7..d5f3767d50 100644 --- a/input/drivers/psp_input.c +++ b/input/drivers/psp_input.c @@ -29,7 +29,7 @@ #include #endif -#include "../../gfx/drivers/psp_sdk_defines.h" +#include "../../defines/psp_defines.h" #include "../../driver.h" #include "../../libretro.h" diff --git a/logger/netlogger/logger.c b/logger/netlogger/logger.c index 6c4126834d..ede9eaf112 100644 --- a/logger/netlogger/logger.c +++ b/logger/netlogger/logger.c @@ -15,7 +15,7 @@ */ #if defined(__CELLOS_LV2__) -#include "../../ps3/sdk_defines.h" +#include "../../defines/ps3_defines.h" #ifndef __PSL1GHT__ #include #include