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

Move stuff to config.features.h

Browse Source
This commit is contained in:
twinaphex 2014-09-25 08:12:58 +02:00
parent 3255824a62
commit d94e8329e8
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config.features.h
View File

@ -194,4 +194,18 @@ static const bool _python_supp = true;
static const bool _python_supp = false; static const bool _python_supp = false;
#endif #endif
#if !defined(_WIN32) && !defined(GLOBAL_CONFIG_DIR)
#if defined(__HAIKU__)
#define GLOBAL_CONFIG_DIR "/system/settings"
#else
#define GLOBAL_CONFIG_DIR "/etc"
#endif
#endif
#ifdef _WIN32
#define RARCH_DEFAULT_CONF_PATH_STR "\n\t\tDefaults to retroarch.cfg in same directory as retroarch.exe.\n\t\tIf a default config is not found, " RETRO_FRONTEND " will attempt to create one."
#else
#define RARCH_DEFAULT_CONF_PATH_STR "\n\t\tBy default looks for config in $XDG_CONFIG_HOME/retroarch/retroarch.cfg,\n\t\t$HOME/.config/retroarch/retroarch.cfg,\n\t\tand $HOME/.retroarch.cfg.\n\t\tIf a default config is not found," RETRO_FRONTEND " will attempt to create one based on the skeleton config (" GLOBAL_CONFIG_DIR "/retroarch.cfg)."
#endif
#endif #endif

6
input/input_common.c
View File

@ -1616,12 +1616,12 @@ retro_input_t input_keys_pressed(unsigned key,
unsigned key_end, const struct retro_keybind **binds) unsigned key_end, const struct retro_keybind **binds)
{ {
retro_input_t ret = 0; retro_input_t ret = 0;
if (driver.block_libretro_input)
return 0;
for (; key < key_end; key++) for (; key < key_end; key++)
{ {
if (driver.block_libretro_input)
return 0;
ret |= driver.input->input_state(driver.input_data, ret |= driver.input->input_state(driver.input_data,
binds, 0, RETRO_DEVICE_JOYPAD, 0, key) ? (1ULL << key) : 0; binds, 0, RETRO_DEVICE_JOYPAD, 0, key) ? (1ULL << key) : 0;
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY

14
retroarch.c
View File

@ -538,20 +538,6 @@ bool rarch_audio_flush(const int16_t *data, size_t samples)
return true; return true;
} }
#if !defined(_WIN32) && !defined(GLOBAL_CONFIG_DIR)
#if defined(__HAIKU__)
#define GLOBAL_CONFIG_DIR "/system/settings"
#else
#define GLOBAL_CONFIG_DIR "/etc"
#endif
#endif
#ifdef _WIN32
#define RARCH_DEFAULT_CONF_PATH_STR "\n\t\tDefaults to retroarch.cfg in same directory as retroarch.exe.\n\t\tIf a default config is not found, " RETRO_FRONTEND " will attempt to create one."
#else
#define RARCH_DEFAULT_CONF_PATH_STR "\n\t\tBy default looks for config in $XDG_CONFIG_HOME/retroarch/retroarch.cfg,\n\t\t$HOME/.config/retroarch/retroarch.cfg,\n\t\tand $HOME/.retroarch.cfg.\n\t\tIf a default config is not found," RETRO_FRONTEND " will attempt to create one based on the skeleton config (" GLOBAL_CONFIG_DIR "/retroarch.cfg)."
#endif
#include "config.features.h" #include "config.features.h"
#define _PSUPP(var, name, desc) printf("\t%s:\n\t\t%s: %s\n", name, desc, _##var##_supp ? "yes" : "no") #define _PSUPP(var, name, desc) printf("\t%s:\n\t\t%s: %s\n", name, desc, _##var##_supp ? "yes" : "no")