Move defines files over to libretro-common

audio/drivers/gx_audio.c

@@ -28,7 +28,7 @@
 #include <retro_inline.h>
 
 #include "../../retroarch.h"
-#include "../../defines/gx_defines.h"
+#include <defines/gx_defines.h>
 
 typedef struct
 {

audio/drivers/ps3_audio.c

@@ -21,7 +21,7 @@
 
 #include "../../retroarch.h"
 
-#include "../../defines/ps3_defines.h"
+#include <defines/ps3_defines.h>
 
 #define AUDIO_BLOCKS 8
 #define AUDIO_CHANNELS 2

bootstrap/vita/sbrk.c

@@ -1,6 +1,6 @@
 #include <errno.h>
 #include <reent.h>
-#include "../../defines/psp_defines.h"
+#include <defines/psp_defines.h>
 #include <psp2/kernel/sysmem.h>
 #include <psp2/kernel/threadmgr.h>
 

frontend/drivers/platform_gx.c

@@ -34,7 +34,7 @@
 #include "../../memory/wii/mem2_manager.h"
 #endif
 
-#include "../../defines/gx_defines.h"
+#include <defines/gx_defines.h>
 
 #include <boolean.h>
 

frontend/drivers/platform_ps3.c

@@ -46,7 +46,7 @@
 
 #include "../frontend_driver.h"
 #include "../../file_path_special.h"
-#include "../../defines/ps3_defines.h"
+#include <defines/ps3_defines.h>
 #include "../../defaults.h"
 #include "../../verbosity.h"
 #include "../../paths.h"

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 <defines/psp_defines.h>
 #include "../../retroarch.h"
 #include "../../paths.h"
 #include "../../verbosity.h"

gfx/common/vita2d_common.h

@@ -23,7 +23,7 @@
 #include <string/stdstring.h>
 #include <gfx/math/matrix_4x4.h>
 
-#include "../../defines/psp_defines.h"
+#include <defines/psp_defines.h>
 #include "../../driver.h"
 #include "../../retroarch.h"
 #include "../video_coord_array.h"

gfx/drivers/d3d8.c

@@ -31,7 +31,7 @@
 
 #include <d3d8.h>
 
-#include "../../defines/d3d_defines.h"
+#include <defines/d3d_defines.h>
 #include "../common/d3d8_common.h"
 #include "../common/d3d_common.h"
 #include "../video_coord_array.h"

gfx/drivers/d3d9.c

@@ -35,7 +35,7 @@
 #include "../../config.h"
 #endif
 
-#include "../../defines/d3d_defines.h"
+#include <defines/d3d_defines.h>
 #include "../common/d3d_common.h"
 #include "../common/d3d9_common.h"
 #include "../video_coord_array.h"

gfx/drivers/gcm_gfx.c

@@ -42,7 +42,7 @@
 #include "../../tasks/tasks_internal.h"
 #endif
 
-#include "../../defines/ps3_defines.h"
+#include <defines/ps3_defines.h>
 
 #include <rsx/rsx.h>
 #include <rsx/nv40.h>

gfx/drivers/gl1.c

@@ -57,7 +57,7 @@
 #endif
 
 #ifdef VITA
-#include "../../defines/psp_defines.h"
+#include <defines/psp_defines.h>
 static bool vgl_inited = false;
 #endif
 

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 <defines/gx_defines.h>
 #include "../../configuration.h"
 #include "../../driver.h"
 

gfx/drivers/gx_gfx_vi_encoder.c

@@ -45,7 +45,7 @@
 
 #include <retro_miscellaneous.h>
 
-#include "../../defines/gx_defines.h"
+#include <defines/gx_defines.h>
 
 void udelay(int us);
 

gfx/drivers/psp1_gfx.c

@@ -35,7 +35,7 @@
 
 #include "../font_driver.h"
 
-#include "../../defines/psp_defines.h"
+#include <defines/psp_defines.h>
 
 #ifndef SCEGU_SCR_WIDTH
 #define SCEGU_SCR_WIDTH 480

gfx/drivers/vita2d_gfx.c

@@ -39,7 +39,7 @@
 #include "../../verbosity.h"
 #include "../../configuration.h"
 
-#include "../../defines/psp_defines.h"
+#include <defines/psp_defines.h>
 
 extern void *memcpy_neon(void *dst, const void *src, size_t n);
 

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 <defines/ps3_defines.h>
 #include "../../frontend/frontend_driver.h"
 #include "../common/gl_common.h"
 

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 <defines/psp_defines.h>
 
 static const float vita2d_vertexes[] = {
    0, 0,

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 <defines/d3d_defines.h>
 #include "../common/d3d_common.h"
 #include "../common/d3d9_common.h"
 

input/drivers/ps3_input.c

@@ -28,7 +28,7 @@
 #include "../../config.h"
 #endif
 
-#include "../../defines/ps3_defines.h"
+#include <defines/ps3_defines.h>
 
 #include "../input_driver.h"
 

input/drivers/psl1ght_input.c

@@ -25,7 +25,7 @@
 #include "../../config.h"
 #endif
 
-#include "../../defines/ps3_defines.h"
+#include <defines/ps3_defines.h>
 
 #include "../input_driver.h"
 

input/drivers/psp_input.c

@@ -47,7 +47,7 @@
 #include "../../bootstrap/psp1/kernel_functions.h"
 #endif
 
-#include "../../defines/psp_defines.h"
+#include <defines/psp_defines.h>
 
 #include "../input_driver.h"
 

input/drivers_joypad/psp_joypad.c

@@ -25,7 +25,7 @@
 
 #include "../../configuration.h"
 
-#include "../../defines/psp_defines.h"
+#include <defines/psp_defines.h>
 
 #ifdef HAVE_MENU
 #include "../../menu/menu_driver.h"

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 <http://www.gnu.org/licenses/>.
+ * 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

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 <http://www.gnu.org/licenses/>.
+ * 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

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 <http://www.gnu.org/licenses/>.
+ * 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

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 <http://www.gnu.org/licenses/>.
+ * 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

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 <http://www.gnu.org/licenses/>.
+ * 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

network/net_logger.c

@@ -15,7 +15,7 @@
  */
 
 #if defined(__PSL1GHT__) || defined(__PS3__)
-#include "../defines/ps3_defines.h"
+#include <defines/ps3_defines.h>
 #endif
 
 #include <stdio.h>

ui/drivers/ui_cocoa.m

@@ -26,7 +26,7 @@
 #include <queues/task_queue.h>
 #include <retro_timers.h>
 
-#include "../../defines/cocoa_defines.h"
+#include <defines/cocoa_defines.h>
 #include "cocoa/cocoa_common.h"
 #include "cocoa/apple_platform.h"