From 81c5019afb3fd55dadcb0b5235653bfac129bc5f Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 21 Oct 2014 08:39:37 +0200 Subject: [PATCH] Move miscellaneous header over to libretro SDK --- Makefile.ps3.rgl | 2 +- camera/video4linux2.c | 2 +- decompress/7zip_support.c | 2 +- decompress/zip_support.c | 2 +- driver.h | 4 +-- file_path.c | 2 +- frontend/menu/disp/rmenu.c | 2 +- general.h | 2 +- gfx/shader/shader_parse.h | 2 +- hash.c | 2 +- libretro-sdk/compat/compat.c | 5 ++- libretro-sdk/include/retro_endianness.h | 2 +- .../include/retro_miscellaneous.h | 32 ++++++++++++------- settings_data.h | 2 +- string_list.c | 2 +- 15 files changed, 35 insertions(+), 30 deletions(-) rename miscellaneous.h => libretro-sdk/include/retro_miscellaneous.h (70%) diff --git a/Makefile.ps3.rgl b/Makefile.ps3.rgl index a446ab9296..5dfe5ba44d 100644 --- a/Makefile.ps3.rgl +++ b/Makefile.ps3.rgl @@ -16,7 +16,7 @@ include $(CELL_MK_DIR)/sdk.makedef.mk PPU_LIB_TARGET = librgl_ps3.a LDDIRS = -L. -INCDIRS = -I. -Ips3/gcmgl/include +INCDIRS = -I. -Ips3/gcmgl/include -Ilibretro-sdk/include RGL_DIR = ps3/gcmgl/src diff --git a/camera/video4linux2.c b/camera/video4linux2.c index 869e968dfd..4ccb4e889f 100644 --- a/camera/video4linux2.c +++ b/camera/video4linux2.c @@ -23,7 +23,7 @@ #include "../general.h" #include "../driver.h" #include "../performance.h" -#include "../miscellaneous.h" +#include #include "../gfx/scaler/scaler.h" #include #include diff --git a/decompress/7zip_support.c b/decompress/7zip_support.c index af539101d8..6b833a938c 100644 --- a/decompress/7zip_support.c +++ b/decompress/7zip_support.c @@ -20,7 +20,7 @@ #include #include -#include "../miscellaneous.h" +#include #include "../file_path.h" #include "7zip_support.h" diff --git a/decompress/zip_support.c b/decompress/zip_support.c index f609a03e9a..27994d6a2d 100644 --- a/decompress/zip_support.c +++ b/decompress/zip_support.c @@ -20,7 +20,7 @@ #include #include -#include "../miscellaneous.h" +#include #include "../file_path.h" #include "zip_support.h" diff --git a/driver.h b/driver.h index 36d39f51eb..e861eb2d1b 100644 --- a/driver.h +++ b/driver.h @@ -31,9 +31,7 @@ #include "audio/dsp_filter.h" #include "input/overlay.h" #include "frontend/frontend_context.h" -#ifndef _WIN32 -#include "miscellaneous.h" -#endif +#include #include "frontend/menu/menu_driver.h" #include "frontend/menu/backend/menu_backend.h" diff --git a/file_path.c b/file_path.c index 65d65e8714..40ccdabef0 100644 --- a/file_path.c +++ b/file_path.c @@ -22,7 +22,7 @@ #include #include #include -#include "miscellaneous.h" +#include #ifdef __HAIKU__ #include diff --git a/frontend/menu/disp/rmenu.c b/frontend/menu/disp/rmenu.c index bfe2360ba3..3469fc9ba5 100644 --- a/frontend/menu/disp/rmenu.c +++ b/frontend/menu/disp/rmenu.c @@ -28,7 +28,7 @@ #include "../../../config.def.h" #include "../../../file.h" #include "../../../dynamic.h" -#include "../../../compat/posix_string.h" +#include #include "../../../performance.h" #include "../../../input/input_common.h" diff --git a/general.h b/general.h index 42c27f10ed..5367e8698e 100644 --- a/general.h +++ b/general.h @@ -32,7 +32,7 @@ #include #include "core_options.h" #include "core_info.h" -#include "miscellaneous.h" +#include #include "gfx/filter.h" #include "playlist.h" diff --git a/gfx/shader/shader_parse.h b/gfx/shader/shader_parse.h index f0cfcd5bd9..d60232d2f1 100644 --- a/gfx/shader/shader_parse.h +++ b/gfx/shader/shader_parse.h @@ -19,7 +19,7 @@ #include #include "../state_tracker.h" #include "../../conf/config_file.h" -#include "../../miscellaneous.h" +#include #ifdef __cplusplus extern "C" { diff --git a/hash.c b/hash.c index a71511add4..a0af63994c 100644 --- a/hash.c +++ b/hash.c @@ -57,7 +57,7 @@ #include #include #include "hash.h" -#include "miscellaneous.h" +#include #include #define LSL32(x, n) ((uint32_t)(x) << (n)) diff --git a/libretro-sdk/compat/compat.c b/libretro-sdk/compat/compat.c index 995142f681..a0db400e8a 100644 --- a/libretro-sdk/compat/compat.c +++ b/libretro-sdk/compat/compat.c @@ -32,9 +32,8 @@ #include #include #include -#ifdef _MSC_VER -#include -#endif + +#include char *optarg; int optind, opterr, optopt; diff --git a/libretro-sdk/include/retro_endianness.h b/libretro-sdk/include/retro_endianness.h index 358e230315..881516f552 100644 --- a/libretro-sdk/include/retro_endianness.h +++ b/libretro-sdk/include/retro_endianness.h @@ -1,7 +1,7 @@ /* Copyright (C) 2010-2014 The RetroArch team * * --------------------------------------------------------------------------------------- - * The following license statement only applies to this file (boolean.h). + * The following license statement only applies to this file (retro_endianness.h). * --------------------------------------------------------------------------------------- * * Permission is hereby granted, free of charge, diff --git a/miscellaneous.h b/libretro-sdk/include/retro_miscellaneous.h similarity index 70% rename from miscellaneous.h rename to libretro-sdk/include/retro_miscellaneous.h index 8ea18b0998..f3b4d42807 100644 --- a/miscellaneous.h +++ b/libretro-sdk/include/retro_miscellaneous.h @@ -1,17 +1,23 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2014 - Daniel De Matteis - * - * 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. +/* Copyright (C) 2010-2014 The RetroArch team * - * 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. + * --------------------------------------------------------------------------------------- + * The following license statement only applies to this file (retro_miscellaneous.h). + * --------------------------------------------------------------------------------------- * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . + * 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: + * + * 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 __RARCH_MISCELLANEOUS_H @@ -37,7 +43,9 @@ #endif #include +#ifdef RARCH_INTERNAL #include "retroarch_logger.h" +#endif #include #include diff --git a/settings_data.h b/settings_data.h index 5bdabd6267..166570d3d8 100644 --- a/settings_data.h +++ b/settings_data.h @@ -18,7 +18,7 @@ #include #include "conf/config_file.h" -#include "miscellaneous.h" +#include #include "settings_list.h" #ifdef __cplusplus diff --git a/string_list.c b/string_list.c index e536c286a7..19bef0f684 100644 --- a/string_list.c +++ b/string_list.c @@ -17,7 +17,7 @@ #include #include "string_list.h" #include -#include "miscellaneous.h" +#include #include #include