mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-08 15:40:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge rarch_console.h with frontend.h

Browse Source
This commit is contained in:
twinaphex 2014-06-01 04:50:00 +02:00
parent 62cd5bbe8a
commit 7303be0195
4 changed files with 27 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
console/rarch_console.h
View File

@ -1,45 +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 CONSOLE_EXT_H__
#define CONSOLE_EXT_H__
#include <stdint.h>
#include <stddef.h>
#ifndef PATH_MAX
#define PATH_MAX 4096
#endif
typedef struct
{
char config_path[PATH_MAX];
char autoconfig_dir[PATH_MAX];
char assets_dir[PATH_MAX];
char core_dir[PATH_MAX];
char core_info_dir[PATH_MAX];
char overlay_dir[PATH_MAX];
char port_dir[PATH_MAX];
char shader_dir[PATH_MAX];
char savestate_dir[PATH_MAX];
char sram_dir[PATH_MAX];
char screenshot_dir[PATH_MAX];
char system_dir[PATH_MAX];
} default_paths_t;
default_paths_t default_paths;
#endif

25
frontend/frontend.h
View File

@ -18,6 +18,13 @@
#ifndef _RARCH_FRONTEND_H
#define _RARCH_FRONTEND_H
#include <stdint.h>
#include <stddef.h>
#ifndef PATH_MAX
#define PATH_MAX 4096
#endif
#if defined(ANDROID)
#define args_type() struct android_app*
#define signature() void* data
@ -26,6 +33,24 @@
#define signature() int argc, char *argv[]
#endif
typedef struct
{
char config_path[PATH_MAX];
char autoconfig_dir[PATH_MAX];
char assets_dir[PATH_MAX];
char core_dir[PATH_MAX];
char core_info_dir[PATH_MAX];
char overlay_dir[PATH_MAX];
char port_dir[PATH_MAX];
char shader_dir[PATH_MAX];
char savestate_dir[PATH_MAX];
char sram_dir[PATH_MAX];
char screenshot_dir[PATH_MAX];
char system_dir[PATH_MAX];
} default_paths_t;
default_paths_t default_paths;
#ifdef __cplusplus
extern "C" {
#endif

2
frontend/frontend_context.h
View File

@ -23,7 +23,7 @@
#include "../config.h"
#endif
#include "../console/rarch_console.h"
#include "frontend.h"
typedef struct frontend_ctx_driver
{

2
settings.c
View File

@ -21,7 +21,7 @@
#include "file.h"
#include "compat/posix_string.h"
#include "input/input_common.h"
#include "console/rarch_console.h"
#include "frontend/frontend.h"
#ifdef HAVE_CONFIG_H
#include "config.h"