Emulation/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-06-02 19:57:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

(libretro-common) Rename file_archive to archive_file

Browse source
This commit is contained in:
twinaphex 2016-03-20 16:14:40 +01:00
parent 435aa5ee7c
commit c7e13e2bcd
14 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile.common
View file

@ -874,8 +874,8 @@ endif
ifeq ($(HAVE_ZLIB), 1)
OBJ += libretro-common/file/file_archive.o \
libretro-common/file/file_archive_zlib.o \
OBJ += libretro-common/file/archive_file.o \
libretro-common/file/archive_file_zlib.o \
tasks/task_decompress.o
OBJ += $(ZLIB_OBJS)
DEFINES += -DHAVE_ZLIB

2
content.c
View file

@ -40,7 +40,7 @@
#include <compat/posix_string.h>
#include <file/file_path.h>
#ifdef HAVE_COMPRESSION
#include <file/file_archive.h>
#include <file/archive_file.h>
#endif
#include <string/stdstring.h>

2
core_info.c
View file

@ -17,7 +17,7 @@
#include <file/file_path.h>
#include <lists/dir_list.h>
#include <file/file_archive.h>
#include <file/archive_file.h>
#include <compat/strl.h>
#include <string/stdstring.h>

2
database_info.h
View file

@ -21,7 +21,7 @@
#include <stdint.h>
#include <stddef.h>
#include <file/file_archive.h>
#include <file/archive_file.h>
#include "libretro-db/libretrodb.h"

8
griffin/griffin.c
View file

@ -45,9 +45,13 @@ CONSOLE EXTENSIONS
#endif
/*============================================================
ARCHIVE FILE
============================================================ */
#ifdef HAVE_ZLIB
#include "../libretro-common/file/file_archive.c"
#include "../libretro-common/file/file_archive_zlib.c"
#include "../libretro-common/file/archive_file.c"
#include "../libretro-common/file/archive_file_zlib.c"
#endif
/*============================================================

6
libretro-common/file/file_archive.c → libretro-common/file/archive_file.c
View file

@ -1,7 +1,7 @@
/* Copyright (C) 2010-2015 The RetroArch team
/* Copyright (C) 2010-2016 The RetroArch team
*
* ---------------------------------------------------------------------------------------
* The following license statement only applies to this file (file_archive.c).
* The following license statement only applies to this file (archive_file.c).
* ---------------------------------------------------------------------------------------
*
* Permission is hereby granted, free of charge,
@ -39,7 +39,7 @@
#endif
#include <compat/strl.h>
#include <file/file_archive.h>
#include <file/archive_file.h>
#include <file/file_path.h>
#include <retro_file.h>
#include <retro_stat.h>

6
libretro-common/file/file_archive_zlib.c → libretro-common/file/archive_file_zlib.c
View file

@ -1,7 +1,7 @@
/* Copyright (C) 2010-2015 The RetroArch team
/* Copyright (C) 2010-2016 The RetroArch team
*
* ---------------------------------------------------------------------------------------
* The following license statement only applies to this file (file_archive_zlib.c).
* The following license statement only applies to this file (archive_file_zlib.c).
* ---------------------------------------------------------------------------------------
*
* Permission is hereby granted, free of charge,
@ -23,7 +23,7 @@
#include <stdlib.h>
#include <compat/zlib.h>
#include <file/file_archive.h>
#include <file/archive_file.h>
#include <retro_file.h>
static void *zlib_stream_new(void)

2
libretro-common/formats/png/rpng.c
View file

@ -32,7 +32,7 @@
#include <boolean.h>
#include <file/nbio.h>
#include <formats/rpng.h>
#include <file/file_archive.h>
#include <file/archive_file.h>
#include "rpng_internal.h"

8
libretro-common/include/file/file_archive.h → libretro-common/include/file/archive_file.h
View file

@ -1,7 +1,7 @@
/* Copyright (C) 2010-2015 The RetroArch team
/* Copyright (C) 2010-2016 The RetroArch team
*
* ---------------------------------------------------------------------------------------
* The following license statement only applies to this file (file_archive.h).
* The following license statement only applies to this file (archive_file.h).
* ---------------------------------------------------------------------------------------
*
* Permission is hereby granted, free of charge,
@ -20,8 +20,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef FILE_ARCHIVE_H__
#define FILE_ARCHIVE_H__
#ifndef LIBRETRO_SDK_ARCHIVE_FILE_H__
#define LIBRETRO_SDK_ARCHIVE_FILE_H__
#include <stdint.h>
#include <stddef.h>

2
libretro-common/include/formats/rpng.h
View file

@ -27,7 +27,7 @@
#include <stddef.h>
#include <boolean.h>
#include <file/file_archive.h>
#include <file/archive_file.h>
#ifdef __cplusplus
extern "C" {

2
menu/menu_displaylist.c
View file

@ -18,7 +18,7 @@
#include <lists/file_list.h>
#include <lists/dir_list.h>
#include <file/file_path.h>
#include <file/file_archive.h>
#include <file/archive_file.h>
#include <retro_stat.h>
#include <string/stdstring.h>

2
patch.c
View file

@ -24,7 +24,7 @@
#include <compat/msvc.h>
#include <file/file_path.h>
#include <file/file_archive.h>
#include <file/archive_file.h>
#include <retro_file.h>
#include <retro_stat.h>
#include <string/stdstring.h>

2
tasks/task_decompress.c
View file

@ -20,7 +20,7 @@
#include <lists/string_list.h>
#include <string/stdstring.h>
#include <file/file_path.h>
#include <file/file_archive.h>
#include <file/archive_file.h>
#include <retro_miscellaneous.h>
#include <retro_stat.h>

2
tasks/task_http.c
View file

@ -20,7 +20,7 @@
#include <string/stdstring.h>
#include <compat/strl.h>
#include <file/file_path.h>
#include <file/file_archive.h>
#include <file/archive_file.h>
#include <net/net_compat.h>
#include <retro_file.h>
#include <retro_stat.h>