CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-12 12:58:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move dir_list to SDK

Browse Source
This commit is contained in:
twinaphex 2014-10-22 01:13:05 +02:00
parent d0650fc17b
commit 174d011bed
21 changed files with 79 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.common
View File

@ -93,7 +93,7 @@ OBJ += frontend/frontend.o \
runloop.o \
content.o \
libretro-sdk/file/file_list.o \
dir_list.o \
libretro-sdk/file/dir_list.o \
libretro-sdk/string/string_list.o \
file_ops.o \
libretro-sdk/file/file_path.o \

2
Makefile.ps3.salamander
View File

@ -19,7 +19,7 @@ endif
STRIP = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe
PPU_CFLAGS += -I. -Ilibretro-sdk/include -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC -DRARCH_INTERNAL
PPU_SRCS = frontend/frontend_salamander.c frontend/frontend_context.c frontend/platform/platform_ps3.c frontend/platform/platform_null.c libretro-sdk/file/file_path.c dir_list.c libretro-sdk/string/string_list.c libretro-sdk/compat/compat.c conf/config_file.c
PPU_SRCS = frontend/frontend_salamander.c frontend/frontend_context.c frontend/platform/platform_ps3.c frontend/platform/platform_null.c libretro-sdk/file/file_path.c libretro-sdk/file/dir_list.c libretro-sdk/string/string_list.c libretro-sdk/compat/compat.c conf/config_file.c
ifeq ($(HAVE_LOGGER), 1)
PPU_CFLAGS += -DHAVE_LOGGER -Ilogger/netlogger

2
Makefile.psp1.salamander
View File

@ -31,7 +31,7 @@ PSP_EBOOT_TITLE = RetroArch
PSP_EBOOT_ICON = psp1/ICON0.PNG
PSP_EBOOT_PIC1 = psp1/PIC1.PNG
OBJS = frontend/frontend_salamander.o frontend/frontend_context.o frontend/platform/platform_psp.o frontend/platform/platform_null.o libretro-sdk/file/file_path.o libretro-sdk/string/string_list.o dir_list.o libretro-sdk/compat/compat.o conf/config_file.o psp1/kernel_functions.o
OBJS = frontend/frontend_salamander.o frontend/frontend_context.o frontend/platform/platform_psp.o frontend/platform/platform_null.o libretro-sdk/file/file_path.o libretro-sdk/string/string_list.o libretro-sdk/file/dir_list.o libretro-sdk/compat/compat.o conf/config_file.o psp1/kernel_functions.o
PSPSDK=$(shell psp-config --pspsdk-path)
include $(PSPSDK)/lib/build.mak

2
Makefile.wii.salamander
View File

@ -39,7 +39,7 @@ LIBS := -lfat -lwiiuse -logc -lbte
APP_BOOTER_DIR = wii/app_booter
OBJ = frontend/frontend_salamander.o frontend/frontend_context.o frontend/platform/platform_gx.o frontend/platform/platform_wii.o frontend/platform/platform_null.o libretro-sdk/file/file_path.o libretro-sdk/string/string_list.o dir_list.o libretro-sdk/compat/compat.o conf/config_file.o $(APP_BOOTER_DIR)/app_booter.binobj
OBJ = frontend/frontend_salamander.o frontend/frontend_context.o frontend/platform/platform_gx.o frontend/platform/platform_wii.o frontend/platform/platform_null.o libretro-sdk/file/file_path.o libretro-sdk/string/string_list.o libretro-sdk/file/dir_list.o libretro-sdk/compat/compat.o conf/config_file.o $(APP_BOOTER_DIR)/app_booter.binobj
ifeq ($(HAVE_LOGGER), 1)
CFLAGS += -DHAVE_LOGGER

2
apple/iOS/browser.m
View File

@ -23,7 +23,7 @@
#include "../../conf/config_file.h"
#include "../../content.h"
#include "../../dir_list.h"
#include <file/dir_list.h>
#include "../../file_ops.h"
#include <file/file_path.h>

2
audio/dsp_filter.c
View File

@ -22,7 +22,7 @@
#include "filters/dspfilter.h"
#include <file/file_path.h>
#include "../file_ext.h"
#include "../dir_list.h"
#include <file/dir_list.h>
#include <compat/posix_string.h>
#include <stdlib.h>

2
core_info.c
View File

@ -18,7 +18,7 @@
#include <file/file_path.h>
#include "file_ext.h"
#include "file_extract.h"
#include "dir_list.h"
#include <file/dir_list.h>
#include "config.def.h"
#ifdef HAVE_CONFIG_H

2
core_options.c
View File

@ -16,7 +16,7 @@
#include "core_options.h"
#include <string.h>
#include "conf/config_file.h"
#include "dir_list.h"
#include <file/dir_list.h>
#include <compat/posix_string.h>
#include <compat/strl.h>

37
dir_list.h
View File

@ -1,37 +0,0 @@
/* 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.
*
* 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 <http://www.gnu.org/licenses/>.
*/
#ifndef _DIR_LIST_H
#define _DIR_LIST_H
#include <string/string_list.h>
#ifdef __cplusplus
extern "C" {
#endif
struct string_list *dir_list_new(const char *dir, const char *ext,
bool include_dirs);
void dir_list_sort(struct string_list *list, bool dir_first);
void dir_list_free(struct string_list *list);
#ifdef __cplusplus
}
#endif
#endif

2
frontend/frontend_salamander.c
View File

@ -23,7 +23,7 @@
#include "../general.h"
#include "../file_ext.h"
#include <file/file_path.h>
#include "../dir_list.h"
#include <file/dir_list.h>
#include "frontend_context.h"
struct defaults g_defaults;

2
frontend/menu/disp/lakka.c
View File

@ -27,7 +27,7 @@
#include "menu_display.h"
#include "../../../general.h"
#include <file/file_path.h>
#include "../../../dir_list.h"
#include <file/dir_list.h>
#include "../../../gfx/gl_common.h"
#include "../../../gfx/video_thread_wrapper.h"
#include <compat/posix_string.h>

2
frontend/menu/menu_entries.c
View File

@ -20,7 +20,7 @@
#include <file/file_list.h>
#include <file/file_path.h>
#include "../../file_ops.h"
#include "../../dir_list.h"
#include <file/dir_list.h>
#include "../../settings_data.h"
#include "../../performance.h"

2
gfx/context/drm_egl_ctx.c
View File

@ -21,7 +21,7 @@
#include "../gfx_context.h"
#include "../gl_common.h"
#include "../gfx_common.h"
#include "../../dir_list.h"
#include <file/dir_list.h>
#ifdef HAVE_CONFIG_H
#include "../../config.h"

2
gfx/filter.c
View File

@ -20,7 +20,7 @@
#include "../general.h"
#include <file/file_path.h>
#include "../file_ext.h"
#include "../dir_list.h"
#include <file/dir_list.h>
#include "../performance.h"
#include <stdlib.h>

2
gfx/video_thread_wrapper.c
View File

@ -15,7 +15,7 @@
#include "video_thread_wrapper.h"
#include "../performance.h"
#include "../dir_list.h"
#include <file/dir_list.h>
#include <stdlib.h>
#include <string.h>
#include <limits.h>

2
griffin/griffin.c
View File

@ -521,7 +521,7 @@ FILE
============================================================ */
#include "../content.c"
#include "../libretro-sdk/file/file_path.c"
#include "../dir_list.c"
#include "../libretro-sdk/file/dir_list.c"
#include "../libretro-sdk/string/string_list.c"
#include "../file_ops.c"
#include "../rarch_compr_file_path.c"

2
input/input_autodetect.c
View File

@ -16,7 +16,7 @@
#include "input_common.h"
#include "input_autodetect.h"
#include "../dir_list.h"
#include <file/dir_list.h>
#include <string.h>
#include <stdlib.h>
#include <ctype.h>

32
dir_list.c → libretro-sdk/file/dir_list.c
View File

@ -1,20 +1,26 @@
/* 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 (dir_list.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 "dir_list.h"
#include <file/dir_list.h>
#include <file/file_path.h>
#include <compat/strl.h>
#include <compat/posix_string.h>

43
libretro-sdk/include/file/dir_list.h Normal file
View File

@ -0,0 +1,43 @@
/* Copyright (C) 2010-2014 The RetroArch team
*
* ---------------------------------------------------------------------------------------
* The following license statement only applies to this file (dir_list.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_DIR_LIST_H
#define __LIBRETRO_SDK_DIR_LIST_H
#include <string/string_list.h>
#ifdef __cplusplus
extern "C" {
#endif
struct string_list *dir_list_new(const char *dir, const char *ext,
bool include_dirs);
void dir_list_sort(struct string_list *list, bool dir_first);
void dir_list_free(struct string_list *list);
#ifdef __cplusplus
}
#endif
#endif

2
retroarch.c
View File

@ -25,7 +25,7 @@
#include "content.h"
#include "file_ops.h"
#include <file/file_path.h>
#include "dir_list.h"
#include <file/dir_list.h>
#include "general.h"
#include <compat/strl.h>
#include "screenshot.h"

1
runloop.c
View File

@ -15,7 +15,6 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "dir_list.h"
#include <file/file_path.h>
#include "performance.h"
#include "retroarch_logger.h"