From dde86f5b6b4470fa65bb4b189ca6abd79ebb91cc Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 21 Oct 2014 06:15:19 +0200 Subject: [PATCH] Refactor compat/ --- compat/apple_compat.h | 33 +++++----- compat/compat.c | 31 +++++---- compat/{fnmatch_rarch.c => compat_fnmatch.c} | 33 +++++----- compat/compat_fnmatch.h | 30 +++++++++ compat/compat_getopt.h | 66 ++++++++++++++++++++ compat/fnmatch_rarch.h | 25 -------- compat/getopt_rarch.h | 59 ----------------- compat/msvc_compat.h | 34 +++++----- compat/posix_string.h | 33 ++++++---- compat/strcasestr.h | 34 ++++++---- compat/strl.h | 33 ++++++---- griffin/griffin.c | 14 ----- retroarch.c | 2 +- tools/retroarch-joyconfig.c | 2 +- 14 files changed, 235 insertions(+), 194 deletions(-) rename compat/{fnmatch_rarch.c => compat_fnmatch.c} (75%) create mode 100644 compat/compat_fnmatch.h create mode 100644 compat/compat_getopt.h delete mode 100644 compat/fnmatch_rarch.h delete mode 100644 compat/getopt_rarch.h diff --git a/compat/apple_compat.h b/compat/apple_compat.h index 15f0f297d8..90cfda8ac2 100644 --- a/compat/apple_compat.h +++ b/compat/apple_compat.h @@ -1,22 +1,25 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2012-2014 - Jason Fetters - * 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 (apple_compat.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. */ -/* Prefix header for all source files of the 'RetroArch' - * target in the 'RetroArch' project. */ - #ifdef IOS #import diff --git a/compat/compat.c b/compat/compat.c index ae7ffa1523..679eb9f7a4 100644 --- a/compat/compat.c +++ b/compat/compat.c @@ -1,19 +1,26 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * - * 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 (compat.c). + * --------------------------------------------------------------------------------------- * - * 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. */ -#include "getopt_rarch.h" +#include "compat_getopt.h" #include "strl.h" #include "strcasestr.h" #include "posix_string.h" diff --git a/compat/fnmatch_rarch.c b/compat/compat_fnmatch.c similarity index 75% rename from compat/fnmatch_rarch.c rename to compat/compat_fnmatch.c index 6fc9558196..a84303a63f 100644 --- a/compat/fnmatch_rarch.c +++ b/compat/compat_fnmatch.c @@ -1,25 +1,30 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2014 - Daniel De Matteis - * Copyright (C) 2012-2014 - Ficoos - * - * 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 (compat_fnmatch.c). + * --------------------------------------------------------------------------------------- * - * 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. */ #if __TEST_FNMATCH__ #include #endif -#include "fnmatch_rarch.h" +#include "compat_fnmatch.h" /* Implemnentation of fnmatch(3) so it can be * distributed to non *nix platforms. diff --git a/compat/compat_fnmatch.h b/compat/compat_fnmatch.h new file mode 100644 index 0000000000..b3693bd0c0 --- /dev/null +++ b/compat/compat_fnmatch.h @@ -0,0 +1,30 @@ +/* Copyright (C) 2010-2014 The RetroArch team + * + * --------------------------------------------------------------------------------------- + * The following license statement only applies to this file (compat_fnmatch.h). + * --------------------------------------------------------------------------------------- + * + * 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 __LIBRETRO_SDK_COMPAT_FNMATCH_H__ +#define __LIBRETRO_SDK_COMPAT_FNMATCH_H__ + +#define FNM_NOMATCH 1 + +int rl_fnmatch(const char *pattern, const char *string, int flags); + +#endif diff --git a/compat/compat_getopt.h b/compat/compat_getopt.h new file mode 100644 index 0000000000..8d6cc5529c --- /dev/null +++ b/compat/compat_getopt.h @@ -0,0 +1,66 @@ +/* Copyright (C) 2010-2014 The RetroArch team + * + * --------------------------------------------------------------------------------------- + * The following license statement only applies to this file (compat_getopt.h). + * --------------------------------------------------------------------------------------- + * + * 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 __LIBRETRO_SDK_COMPAT_GETOPT_H +#define __LIBRETRO_SDK_COMPAT_GETOPT_H + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +/* Custom implementation of the GNU getopt_long for portability. + * Not designed to be fully compatible, but compatible with + * the features RetroArch uses. */ + +#ifdef HAVE_GETOPT_LONG +#include +#else +/* Avoid possible naming collisions during link since we + * prefer to use the actual name. */ +#define getopt_long(argc, argv, optstring, longopts, longindex) __getopt_long_rarch(argc, argv, optstring, longopts, longindex) + +#ifdef __cplusplus +extern "C" { +#endif + +struct option +{ + const char *name; + int has_arg; + int *flag; + int val; +}; + +/* argv[] is declared with char * const argv[] in GNU, + * but this makes no sense, as non-POSIX getopt_long + * mutates argv (non-opts are moved to the end). */ +int getopt_long(int argc, char *argv[], + const char *optstring, const struct option *longopts, int *longindex); +extern char *optarg; +extern int optind, opterr, optopt; +#ifdef __cplusplus +} +#endif +#endif + +#endif + diff --git a/compat/fnmatch_rarch.h b/compat/fnmatch_rarch.h deleted file mode 100644 index 5f18dfc150..0000000000 --- a/compat/fnmatch_rarch.h +++ /dev/null @@ -1,25 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2014 - Daniel De Matteis - * Copyright (C) 2012-2014 - Ficoos - * - * 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. - * - * 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. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#ifndef __RL_FNMATCH_H__ -#define __RL_FNMATCH_H__ - -#define FNM_NOMATCH 1 - -int rl_fnmatch(const char *pattern, const char *string, int flags); - -#endif diff --git a/compat/getopt_rarch.h b/compat/getopt_rarch.h deleted file mode 100644 index 10bf3b4a7b..0000000000 --- a/compat/getopt_rarch.h +++ /dev/null @@ -1,59 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * - * 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. - * - * 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. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#ifndef __RARCH_GETOPT_H -#define __RARCH_GETOPT_H - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -/* Custom implementation of the GNU getopt_long for portability. - * Not designed to be fully compatible, but compatible with - * the features RetroArch uses. */ - -#ifdef HAVE_GETOPT_LONG -#include -#else -/* Avoid possible naming collisions during link since we - * prefer to use the actual name. */ -#define getopt_long(argc, argv, optstring, longopts, longindex) __getopt_long_rarch(argc, argv, optstring, longopts, longindex) - -#ifdef __cplusplus -extern "C" { -#endif - -struct option -{ - const char *name; - int has_arg; - int *flag; - int val; -}; - -/* argv[] is declared with char * const argv[] in GNU, - * but this makes no sense, as non-POSIX getopt_long - * mutates argv (non-opts are moved to the end). */ -int getopt_long(int argc, char *argv[], - const char *optstring, const struct option *longopts, int *longindex); -extern char *optarg; -extern int optind, opterr, optopt; -#ifdef __cplusplus -} -#endif -#endif - -#endif - diff --git a/compat/msvc_compat.h b/compat/msvc_compat.h index e65ae493b4..c3593bb06c 100644 --- a/compat/msvc_compat.h +++ b/compat/msvc_compat.h @@ -1,21 +1,27 @@ -/* 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 (msvc_compat.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_MSVC_COMPAT_H -#define __RARCH_MSVC_COMPAT_H +#ifndef __LIBRETRO_SDK_COMPAT_MSVC_H +#define __LIBRETRO_SDK_COMPAT_MSVC_H #ifdef _MSC_VER diff --git a/compat/posix_string.h b/compat/posix_string.h index 76604e4eba..c49879cdef 100644 --- a/compat/posix_string.h +++ b/compat/posix_string.h @@ -1,20 +1,27 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * - * 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 (posix_string.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_POSIX_STRING_H -#define __RARCH_POSIX_STRING_H +#ifndef __LIBRETRO_SDK_COMPAT_POSIX_STRING_H +#define __LIBRETRO_SDK_COMPAT_POSIX_STRING_H #ifdef _WIN32 diff --git a/compat/strcasestr.h b/compat/strcasestr.h index 40ba121939..543b05822a 100644 --- a/compat/strcasestr.h +++ b/compat/strcasestr.h @@ -1,20 +1,27 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * - * 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 (strcasestr.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_STRCASESTR_H -#define RARCH_STRCASESTR_H +#ifndef __LIBRETRO_SDK_COMPAT_STRCASESTR_H +#define __LIBRETRO_SDK_COMPAT_STRCASESTR_H #include @@ -31,6 +38,7 @@ extern "C" { /* Avoid possible naming collisions during link * since we prefer to use the actual name. */ #define strcasestr(haystack, needle) strcasestr_rarch__(haystack, needle) + char *strcasestr(const char *haystack, const char *needle); #ifdef __cplusplus diff --git a/compat/strl.h b/compat/strl.h index bf9091d881..2e274e48d6 100644 --- a/compat/strl.h +++ b/compat/strl.h @@ -1,20 +1,27 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * - * 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 (strl.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_STRL_H -#define __RARCH_STRL_H +#ifndef __LIBRETRO_SDK_COMPAT_STRL_H +#define __LIBRETRO_SDK_COMPAT_STRL_H #include #include diff --git a/griffin/griffin.c b/griffin/griffin.c index 865a910bc6..c6504d3525 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -48,20 +48,6 @@ CONSOLE EXTENSIONS #include "../decompress/zip_support.c" #endif - - -/*============================================================ -RLAUNCH -============================================================ */ - -#ifdef HAVE_RLAUNCH -#include "../tools/retrolaunch/rl_fnmatch.c" -#include "../tools/retrolaunch/sha1.c" -#include "../tools/retrolaunch/cd_detect.c" -#include "../tools/retrolaunch/parser.c" -#include "../tools/retrolaunch/main.c" -#endif - /*============================================================ PERFORMANCE ============================================================ */ diff --git a/retroarch.c b/retroarch.c index df93d95eb5..9ce19aa653 100644 --- a/retroarch.c +++ b/retroarch.c @@ -32,7 +32,7 @@ #include "screenshot.h" #include "performance.h" #include "cheats.h" -#include "compat/getopt_rarch.h" +#include "compat/compat_getopt.h" #include "compat/posix_string.h" #include "input/keyboard_line.h" #include "input/input_common.h" diff --git a/tools/retroarch-joyconfig.c b/tools/retroarch-joyconfig.c index 6b5dc7abe8..e571841665 100644 --- a/tools/retroarch-joyconfig.c +++ b/tools/retroarch-joyconfig.c @@ -20,7 +20,7 @@ #include "conf/config_file.h" #include #include -#include "../compat/getopt_rarch.h" +#include "../compat/compat_getopt.h" #include #include "../input/input_common.h" #include "../general.h"