diff --git a/audio/drivers/gx_audio.c b/audio/drivers/gx_audio.c index 9119356235..a6c7c83ce5 100644 --- a/audio/drivers/gx_audio.c +++ b/audio/drivers/gx_audio.c @@ -28,7 +28,7 @@ #include #include "../../retroarch.h" -#include "../../defines/gx_defines.h" +#include typedef struct { diff --git a/audio/drivers/ps3_audio.c b/audio/drivers/ps3_audio.c index 183b3f9e1f..14d100e63a 100644 --- a/audio/drivers/ps3_audio.c +++ b/audio/drivers/ps3_audio.c @@ -21,7 +21,7 @@ #include "../../retroarch.h" -#include "../../defines/ps3_defines.h" +#include #define AUDIO_BLOCKS 8 #define AUDIO_CHANNELS 2 diff --git a/bootstrap/vita/sbrk.c b/bootstrap/vita/sbrk.c index 49df34fa57..b15f5eb8e2 100644 --- a/bootstrap/vita/sbrk.c +++ b/bootstrap/vita/sbrk.c @@ -1,6 +1,6 @@ #include #include -#include "../../defines/psp_defines.h" +#include #include #include diff --git a/frontend/drivers/platform_gx.c b/frontend/drivers/platform_gx.c index 46a646f49d..817d7ab1d7 100644 --- a/frontend/drivers/platform_gx.c +++ b/frontend/drivers/platform_gx.c @@ -34,7 +34,7 @@ #include "../../memory/wii/mem2_manager.h" #endif -#include "../../defines/gx_defines.h" +#include #include diff --git a/frontend/drivers/platform_ps3.c b/frontend/drivers/platform_ps3.c index ca27256169..541e8d6c02 100644 --- a/frontend/drivers/platform_ps3.c +++ b/frontend/drivers/platform_ps3.c @@ -46,7 +46,7 @@ #include "../frontend_driver.h" #include "../../file_path_special.h" -#include "../../defines/ps3_defines.h" +#include #include "../../defaults.h" #include "../../verbosity.h" #include "../../paths.h" diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c index 313d581b21..2a29356a07 100644 --- a/frontend/drivers/platform_psp.c +++ b/frontend/drivers/platform_psp.c @@ -55,7 +55,7 @@ #include "../frontend_driver.h" #include "../../defaults.h" #include "../../file_path_special.h" -#include "../../defines/psp_defines.h" +#include #include "../../retroarch.h" #include "../../paths.h" #include "../../verbosity.h" diff --git a/gfx/common/vita2d_common.h b/gfx/common/vita2d_common.h index 5d52f8bb0f..e6e128bb0a 100644 --- a/gfx/common/vita2d_common.h +++ b/gfx/common/vita2d_common.h @@ -23,7 +23,7 @@ #include #include -#include "../../defines/psp_defines.h" +#include #include "../../driver.h" #include "../../retroarch.h" #include "../video_coord_array.h" diff --git a/gfx/drivers/d3d8.c b/gfx/drivers/d3d8.c index 89d86280cb..9e814cd031 100644 --- a/gfx/drivers/d3d8.c +++ b/gfx/drivers/d3d8.c @@ -31,7 +31,7 @@ #include -#include "../../defines/d3d_defines.h" +#include #include "../common/d3d8_common.h" #include "../common/d3d_common.h" #include "../video_coord_array.h" diff --git a/gfx/drivers/d3d9.c b/gfx/drivers/d3d9.c index 6f43460fce..134e5e3e13 100644 --- a/gfx/drivers/d3d9.c +++ b/gfx/drivers/d3d9.c @@ -35,7 +35,7 @@ #include "../../config.h" #endif -#include "../../defines/d3d_defines.h" +#include #include "../common/d3d_common.h" #include "../common/d3d9_common.h" #include "../video_coord_array.h" diff --git a/gfx/drivers/gcm_gfx.c b/gfx/drivers/gcm_gfx.c index 6ee90f052c..1fa86f06a1 100644 --- a/gfx/drivers/gcm_gfx.c +++ b/gfx/drivers/gcm_gfx.c @@ -42,7 +42,7 @@ #include "../../tasks/tasks_internal.h" #endif -#include "../../defines/ps3_defines.h" +#include #include #include diff --git a/gfx/drivers/gl1.c b/gfx/drivers/gl1.c index 2162bb30e9..2bc373e1cd 100644 --- a/gfx/drivers/gl1.c +++ b/gfx/drivers/gl1.c @@ -57,7 +57,7 @@ #endif #ifdef VITA -#include "../../defines/psp_defines.h" +#include static bool vgl_inited = false; #endif diff --git a/gfx/drivers/gx_gfx.c b/gfx/drivers/gx_gfx.c index 381bd8016c..b14f1bfb03 100644 --- a/gfx/drivers/gx_gfx.c +++ b/gfx/drivers/gx_gfx.c @@ -39,7 +39,7 @@ #include "../font_driver.h" #include "../drivers_font_renderer/bitmap.h" -#include "../../defines/gx_defines.h" +#include #include "../../configuration.h" #include "../../driver.h" diff --git a/gfx/drivers/gx_gfx_vi_encoder.c b/gfx/drivers/gx_gfx_vi_encoder.c index 5b7a4ca905..484bbc7cee 100644 --- a/gfx/drivers/gx_gfx_vi_encoder.c +++ b/gfx/drivers/gx_gfx_vi_encoder.c @@ -45,7 +45,7 @@ #include -#include "../../defines/gx_defines.h" +#include void udelay(int us); diff --git a/gfx/drivers/psp1_gfx.c b/gfx/drivers/psp1_gfx.c index f4d9e8fc0b..ffdf5e4233 100644 --- a/gfx/drivers/psp1_gfx.c +++ b/gfx/drivers/psp1_gfx.c @@ -35,7 +35,7 @@ #include "../font_driver.h" -#include "../../defines/psp_defines.h" +#include #ifndef SCEGU_SCR_WIDTH #define SCEGU_SCR_WIDTH 480 diff --git a/gfx/drivers/vita2d_gfx.c b/gfx/drivers/vita2d_gfx.c index 57867ecadb..99027d3cec 100644 --- a/gfx/drivers/vita2d_gfx.c +++ b/gfx/drivers/vita2d_gfx.c @@ -39,7 +39,7 @@ #include "../../verbosity.h" #include "../../configuration.h" -#include "../../defines/psp_defines.h" +#include extern void *memcpy_neon(void *dst, const void *src, size_t n); diff --git a/gfx/drivers_context/ps3_ctx.c b/gfx/drivers_context/ps3_ctx.c index 916169b0d6..69567257ef 100644 --- a/gfx/drivers_context/ps3_ctx.c +++ b/gfx/drivers_context/ps3_ctx.c @@ -27,7 +27,7 @@ #include "../../configuration.h" #include "../../retroarch.h" #include "../../verbosity.h" -#include "../../defines/ps3_defines.h" +#include #include "../../frontend/frontend_driver.h" #include "../common/gl_common.h" diff --git a/gfx/drivers_display/gfx_display_vita2d.c b/gfx/drivers_display/gfx_display_vita2d.c index 525d636272..f2744ce9c8 100644 --- a/gfx/drivers_display/gfx_display_vita2d.c +++ b/gfx/drivers_display/gfx_display_vita2d.c @@ -26,7 +26,7 @@ #include "../../retroarch.h" #include "../font_driver.h" #include "../common/vita2d_common.h" -#include "../../defines/psp_defines.h" +#include static const float vita2d_vertexes[] = { 0, 0, diff --git a/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c b/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c index 4c9b2cf890..8b6242335b 100644 --- a/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c +++ b/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c @@ -28,7 +28,7 @@ #include "../drivers/d3d_shaders/opaque.hlsl.d3d9.h" -#include "../../defines/d3d_defines.h" +#include #include "../common/d3d_common.h" #include "../common/d3d9_common.h" diff --git a/input/drivers/ps3_input.c b/input/drivers/ps3_input.c index 8e070e76cb..ecfe0a901c 100644 --- a/input/drivers/ps3_input.c +++ b/input/drivers/ps3_input.c @@ -28,7 +28,7 @@ #include "../../config.h" #endif -#include "../../defines/ps3_defines.h" +#include #include "../input_driver.h" diff --git a/input/drivers/psl1ght_input.c b/input/drivers/psl1ght_input.c index 7950ea9c1b..e369465cec 100644 --- a/input/drivers/psl1ght_input.c +++ b/input/drivers/psl1ght_input.c @@ -25,7 +25,7 @@ #include "../../config.h" #endif -#include "../../defines/ps3_defines.h" +#include #include "../input_driver.h" diff --git a/input/drivers/psp_input.c b/input/drivers/psp_input.c index 5865f456ff..7f42aca420 100644 --- a/input/drivers/psp_input.c +++ b/input/drivers/psp_input.c @@ -47,7 +47,7 @@ #include "../../bootstrap/psp1/kernel_functions.h" #endif -#include "../../defines/psp_defines.h" +#include #include "../input_driver.h" diff --git a/input/drivers_joypad/psp_joypad.c b/input/drivers_joypad/psp_joypad.c index a6b006ed52..64fc1f99d8 100644 --- a/input/drivers_joypad/psp_joypad.c +++ b/input/drivers_joypad/psp_joypad.c @@ -25,7 +25,7 @@ #include "../../configuration.h" -#include "../../defines/psp_defines.h" +#include #ifdef HAVE_MENU #include "../../menu/menu_driver.h" diff --git a/defines/cocoa_defines.h b/libretro-common/include/defines/cocoa_defines.h similarity index 60% rename from defines/cocoa_defines.h rename to libretro-common/include/defines/cocoa_defines.h index f2f6fd887e..51f7179792 100644 --- a/defines/cocoa_defines.h +++ b/libretro-common/include/defines/cocoa_defines.h @@ -1,17 +1,23 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2013-2014 - Jason Fetters - * Copyright (C) 2011-2019 - Daniel De Matteis +/* Copyright (C) 2010-2021 The RetroArch team * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. + * --------------------------------------------------------------------------------------- + * The following license statement only applies to this file (cocoa_defines.h). + * --------------------------------------------------------------------------------------- * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. + * Permission is hereby granted, free of charge, + * to any person obtaining a copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to the following conditions: * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #ifndef __COCOA_COMMON_DEFINES_H diff --git a/defines/d3d_defines.h b/libretro-common/include/defines/d3d_defines.h similarity index 61% rename from defines/d3d_defines.h rename to libretro-common/include/defines/d3d_defines.h index 62b27e6550..a090f4ca8d 100644 --- a/defines/d3d_defines.h +++ b/libretro-common/include/defines/d3d_defines.h @@ -1,17 +1,23 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2017 - Daniel De Matteis +/* Copyright (C) 2010-2021 The RetroArch team * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. + * --------------------------------------------------------------------------------------- + * The following license statement only applies to this file (d3d_defines.h). + * --------------------------------------------------------------------------------------- * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. + * Permission is hereby granted, free of charge, + * to any person obtaining a copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to the following conditions: * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #ifndef D3DVIDEO_DEFINES_H diff --git a/defines/gx_defines.h b/libretro-common/include/defines/gx_defines.h similarity index 63% rename from defines/gx_defines.h rename to libretro-common/include/defines/gx_defines.h index c9e7c28e7c..2b6b904788 100644 --- a/defines/gx_defines.h +++ b/libretro-common/include/defines/gx_defines.h @@ -1,16 +1,23 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2011-2017 - Daniel De Matteis +/* Copyright (C) 2010-2021 The RetroArch team * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. + * --------------------------------------------------------------------------------------- + * The following license statement only applies to this file (gx_defines.h). + * --------------------------------------------------------------------------------------- * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. + * Permission is hereby granted, free of charge, + * to any person obtaining a copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to the following conditions: * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #ifndef _GX_DEFINES_H diff --git a/defines/ps3_defines.h b/libretro-common/include/defines/ps3_defines.h similarity index 94% rename from defines/ps3_defines.h rename to libretro-common/include/defines/ps3_defines.h index a3340e9128..8114628327 100644 --- a/defines/ps3_defines.h +++ b/libretro-common/include/defines/ps3_defines.h @@ -1,17 +1,23 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2017 - Daniel De Matteis +/* Copyright (C) 2010-2021 The RetroArch team * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. + * --------------------------------------------------------------------------------------- + * The following license statement only applies to this file (ps3_defines.h). + * --------------------------------------------------------------------------------------- * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. + * Permission is hereby granted, free of charge, + * to any person obtaining a copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to the following conditions: * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #ifndef _PS3_DEFINES_H diff --git a/defines/psp_defines.h b/libretro-common/include/defines/psp_defines.h similarity index 73% rename from defines/psp_defines.h rename to libretro-common/include/defines/psp_defines.h index 491788cf8d..5f7b7cf08d 100644 --- a/defines/psp_defines.h +++ b/libretro-common/include/defines/psp_defines.h @@ -1,17 +1,23 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2017 - Daniel De Matteis +/* Copyright (C) 2010-2021 The RetroArch team * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. + * --------------------------------------------------------------------------------------- + * The following license statement only applies to this file (psp_defines.h). + * --------------------------------------------------------------------------------------- * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. + * Permission is hereby granted, free of charge, + * to any person obtaining a copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to the following conditions: * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #ifndef _PSP_DEFINES_H diff --git a/network/net_logger.c b/network/net_logger.c index c1195c2917..78857f179c 100644 --- a/network/net_logger.c +++ b/network/net_logger.c @@ -15,7 +15,7 @@ */ #if defined(__PSL1GHT__) || defined(__PS3__) -#include "../defines/ps3_defines.h" +#include #endif #include diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m index 51a586f87c..75d03a2ca5 100644 --- a/ui/drivers/ui_cocoa.m +++ b/ui/drivers/ui_cocoa.m @@ -26,7 +26,7 @@ #include #include -#include "../../defines/cocoa_defines.h" +#include #include "cocoa/cocoa_common.h" #include "cocoa/apple_platform.h"