mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-23 01:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Buildfixes

Browse Source
This commit is contained in:
twinaphex 2015-08-20 00:49:44 +02:00
parent bfb7ee30c5
commit 9fd17a196f
6 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dynamic.c
View File

@ -752,7 +752,7 @@ bool rarch_environment_cb(unsigned cmd, void *data)
break; break;
case RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY: case RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY:
if (settings->system_directory[0] == '\0' || settings->system_directory[0] == '\0') if (settings->system_directory[0] == '\0')
{ {
RARCH_WARN("SYSTEM DIR is empty, assume CONTENT DIR %s\n",global->path.fullpath); RARCH_WARN("SYSTEM DIR is empty, assume CONTENT DIR %s\n",global->path.fullpath);
fill_pathname_basedir(buf, global->path.fullpath, fill_pathname_basedir(buf, global->path.fullpath,

9
input/drivers/rwebinput_input.c
View File

@ -17,6 +17,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <boolean.h> #include <boolean.h>
#include "../input_joypad.h"
#include "../input_autodetect.h" #include "../input_autodetect.h"
#include "../input_common.h" #include "../input_common.h"
#include "../input_keymaps.h" #include "../input_keymaps.h"
@ -68,7 +69,7 @@ error:
return NULL; return NULL;
} }
static bool rwebinput_key_pressed(void *data, int key) static bool rwebinput_key_pressed__(void *data, int key)
{ {
unsigned sym; unsigned sym;
bool ret; bool ret;
@ -96,7 +97,7 @@ static bool rwebinput_is_pressed(rwebinput_input_t *rwebinput,
if (id < RARCH_BIND_LIST_END) if (id < RARCH_BIND_LIST_END)
{ {
const struct retro_keybind *bind = &binds[id]; const struct retro_keybind *bind = &binds[id];
return bind->valid && rwebinput_key_pressed(rwebinput, binds[id].key); return bind->valid && rwebinput_key_pressed__(rwebinput, binds[id].key);
} }
return false; return false;
@ -242,7 +243,7 @@ static bool rwebinput_keyboard_mapping_is_blocked(void *data)
rwebinput_input_t *rwebinput = (rwebinput_input_t*)data; rwebinput_input_t *rwebinput = (rwebinput_input_t*)data;
if (!rwebinput) if (!rwebinput)
return false; return false;
return rwebinput->blocked; return rwebinput->state.blocked;
} }
static void rwebinput_keyboard_mapping_set_block(void *data, bool value) static void rwebinput_keyboard_mapping_set_block(void *data, bool value)
@ -250,7 +251,7 @@ static void rwebinput_keyboard_mapping_set_block(void *data, bool value)
rwebinput_input_t *rwebinput = (rwebinput_input_t*)data; rwebinput_input_t *rwebinput = (rwebinput_input_t*)data;
if (!rwebinput) if (!rwebinput)
return; return;
rwebinput->blocked = value; rwebinput->state.blocked = value;
} }
input_driver_t input_rwebinput = { input_driver_t input_rwebinput = {

3
menu/cbs/menu_cbs_ok.c
View File

@ -1056,13 +1056,14 @@ static int action_ok_core_load(const char *path,
return -1; return -1;
} }
return 0;
/* Core selection on non-console just updates directory listing. /* Core selection on non-console just updates directory listing.
* Will take effect on new content load. */ * Will take effect on new content load. */
#elif defined(RARCH_CONSOLE) #elif defined(RARCH_CONSOLE)
event_command(EVENT_CMD_RESTART_RETROARCH); event_command(EVENT_CMD_RESTART_RETROARCH);
return -1; return -1;
#endif #endif
return 0;
} }
static int action_ok_core_download(const char *path, static int action_ok_core_download(const char *path,

5
menu/menu_displaylist.c
View File

@ -42,10 +42,11 @@
#include "../frontend/drivers/platform_android.h" #include "../frontend/drivers/platform_android.h"
#endif #endif
extern unsigned rpl_entry_selection_ptr;
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
extern char *core_buf; extern char *core_buf;
extern size_t core_len; extern size_t core_len;
extern unsigned rpl_entry_selection_ptr;
static void print_buf_lines(file_list_t *list, char *buf, int buf_size, static void print_buf_lines(file_list_t *list, char *buf, int buf_size,
unsigned type) unsigned type)
@ -1790,7 +1791,7 @@ static int menu_displaylist_parse_horizontal_content_actions(menu_displaylist_in
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
unsigned idx = rpl_entry_selection_ptr; unsigned idx = rpl_entry_selection_ptr;
const char *label = NULL; const char *label = NULL;
const char *core_path = NULL; const char *core_path = NULL;
const char *core_name = NULL; const char *core_name = NULL;

2
menu/menu_setting.c
View File

@ -1352,6 +1352,7 @@ static void setting_get_string_representation_uint_analog_dpad_mode(void *data,
len); len);
} }
#ifdef HAVE_THREADS
static void setting_get_string_representation_uint_autosave_interval(void *data, static void setting_get_string_representation_uint_autosave_interval(void *data,
char *s, size_t len) char *s, size_t len)
{ {
@ -1365,6 +1366,7 @@ static void setting_get_string_representation_uint_autosave_interval(void *data,
else else
strlcpy(s, menu_hash_to_str(MENU_VALUE_OFF), len); strlcpy(s, menu_hash_to_str(MENU_VALUE_OFF), len);
} }
#endif
static void setting_get_string_representation_uint_user_language(void *data, static void setting_get_string_representation_uint_user_language(void *data,
char *s, size_t len) char *s, size_t len)

2
retroarch.c
View File

@ -313,7 +313,7 @@ static void set_special_paths(char **argv, unsigned num_content)
/* If this is already set, /* If this is already set,
* do not overwrite it as this was initialized before in * do not overwrite it as this was initialized before in
* a menu or otherwise. */ * a menu or otherwise. */
if (!settings->system_directory || settings->system_directory[0] == '\0') if (settings->system_directory[0] == '\0')
{ {
RARCH_WARN("SYSTEM DIR is empty, assume CONTENT DIR %s\n",argv[0]); RARCH_WARN("SYSTEM DIR is empty, assume CONTENT DIR %s\n",argv[0]);
/*fill_pathname_basedir(settings->system_directory, argv[0], /*fill_pathname_basedir(settings->system_directory, argv[0],