(libretro-common) Move file_extract.c to libretro-common

2024-07-05 09:48:42 +00:00 · 2015-03-28 20:14:19 +01:00 · 2015-03-28 20:14:19 +01:00 · c26804335b
commit c26804335b
parent f8b1a8a382
11 changed files with 46 additions and 34 deletions
--- a/Makefile.common
+++ b/Makefile.common
@ -597,7 +597,7 @@ ifeq ($(HAVE_ZLIB), 1)
 			 libretro-common/formats/png/rpng_fbio.o \
 			 libretro-common/formats/png/rpng_decode.o \
 			 libretro-common/formats/png/rpng_encode.o \
-			 file_extract.o
+			 libretro-common/file/file_extract.o
   OBJ += $(ZLIB_OBJS)
   DEFINES += -DHAVE_ZLIB
   HAVE_COMPRESSION = 1 
--- a/content.c
+++ b/content.c
@ -27,7 +27,7 @@
 #include "patch.h"
 #include "compat/strl.h"
 #include "hash.h"
-#include "file_extract.h"
+#include <file/file_extract.h>

 #ifdef _WIN32
 #ifdef _XBOX
--- a/core_info.c
+++ b/core_info.c
@ -19,7 +19,7 @@
 #include "general.h"
 #include <file/file_path.h>
 #include "file_ext.h"
-#include "file_extract.h"
+#include <file/file_extract.h>
 #include <file/dir_list.h>
 #include "config.def.h"

--- a/database_info.c
+++ b/database_info.c
@ -18,7 +18,7 @@
 #include "database_info.h"
 #include "hash.h"
 #include "file_ops.h"
-#include "file_extract.h"
+#include <file/file_extract.h>
 #include "general.h"
 #include "runloop.h"
 #include <file/file_path.h>
--- a/file_ops.c
+++ b/file_ops.c
@ -26,7 +26,7 @@
 #include <retro_miscellaneous.h>

 #ifdef HAVE_COMPRESSION
-#include "file_extract.h"
+#include <file/file_extract.h>
 #endif

 #ifdef HAVE_7ZIP
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@ -44,7 +44,7 @@ CONSOLE EXTENSIONS
 #endif

 #ifdef HAVE_ZLIB
-#include "../file_extract.c"
+#include "../libretro-common/file/file_extract.c"
 #include "../decompress/zip_support.c"
 #endif

--- a/libretro-common/file/file_extract.c
+++ b/libretro-common/file/file_extract.c
@ -1,20 +1,26 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2015 - 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-2015 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 (file_extract.c).
+ * ---------------------------------------------------------------------------------------
 *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
+ * 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 "file_extract.h"
+#include <file/file_extract.h>
 #include <file/file_path.h>
 #include <compat/strl.h>
 #include <retro_miscellaneous.h>
--- a/libretro-common/include/file/file_extract.h
+++ b/libretro-common/include/file/file_extract.h
@ -1,17 +1,23 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2015 - 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-2015 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 (file_extract.h).
+ * ---------------------------------------------------------------------------------------
 *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
+ * 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 FILE_EXTRACT_H__
--- a/menu/menu_entries.c
+++ b/menu/menu_entries.c
@ -19,7 +19,7 @@
 #include "menu_navigation.h"
 #include <file/file_list.h>
 #include <file/file_path.h>
-#include "../file_extract.h"
+#include <file/file_extract.h>
 #include "../file_ops.h"
 #include <file/dir_list.h>

--- a/menu/menu_entries_cbs.c
+++ b/menu/menu_entries_cbs.c
@ -21,7 +21,7 @@
 #include "menu_entries.h"
 #include "menu_navigation.h"

-#include "../file_extract.h"
+#include <file/file_extract.h>
 #include "../file_ops.h"
 #include "../config.def.h"
 #include "../retroarch.h"
--- a/patch.c
+++ b/patch.c
@ -25,7 +25,7 @@
 #include "patch.h"
 #include "hash.h"
 #include "file_ops.h"
-#include "file_extract.h"
+#include <file/file_extract.h>
 #include "general.h"
 #include "retroarch_logger.h"