Move default_paths to settings.c

This commit is contained in:
twinaphex 2014-06-01 05:06:55 +02:00
parent 7303be0195
commit 4d63b1d391
4 changed files with 18 additions and 23 deletions

View File

@ -71,7 +71,6 @@
#define attempt_load_game_push_history false
#endif
default_paths_t default_paths;
static retro_keyboard_event_t key_event;
#ifdef HAVE_MENU

View File

@ -21,10 +21,6 @@
#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
@ -33,24 +29,6 @@
#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

View File

@ -124,6 +124,22 @@ enum sound_mode_enums
SOUND_MODE_LAST
};
struct defaults
{
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];
};
// All config related settings go here.
struct settings
{
@ -693,6 +709,7 @@ struct rarch_main_wrap
// Public data structures
extern struct settings g_settings;
extern struct global g_extern;
extern struct defaults default_paths;
/////////
// Public functions

View File

@ -31,6 +31,7 @@
struct settings g_settings;
struct global g_extern;
struct defaults default_paths;
const char *config_get_default_audio(void)
{