Minor fixes/tweaks to make it easier for switch port
Unused x86-specific header unnecessarily included :/ Move config ini stuff into its own namespace, believe it or not but conflicts with some random switch header. Tested: built for Android, Linux x64 w/ & w/o rec-cpp.
This commit is contained in:
parent
46a6a72a3e
commit
cb278e367b
|
@ -12,7 +12,7 @@
|
|||
string cfgPath;
|
||||
bool save_config = true;
|
||||
|
||||
ConfigFile cfgdb;
|
||||
emucfg::ConfigFile cfgdb;
|
||||
|
||||
void savecfgf()
|
||||
{
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
|
||||
wchar* trim_ws(wchar* str);
|
||||
|
||||
namespace emucfg {
|
||||
|
||||
/* ConfigEntry */
|
||||
|
||||
string ConfigEntry::get_string()
|
||||
|
@ -281,3 +283,6 @@ void ConfigFile::save(FILE* file)
|
|||
fputs("\n", file);
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace emucfg
|
||||
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
#include "types.h"
|
||||
#include <map>
|
||||
|
||||
namespace emucfg {
|
||||
|
||||
struct ConfigEntry {
|
||||
string value;
|
||||
string get_string();
|
||||
|
@ -41,3 +43,6 @@ struct ConfigFile {
|
|||
void set_int(string section_name, string entry_name, int value, bool is_virtual = false);
|
||||
void set_bool(string section_name, string entry_name, bool value, bool is_virtual = false);
|
||||
};
|
||||
|
||||
} // namespace emucfg
|
||||
|
||||
|
|
|
@ -161,7 +161,7 @@
|
|||
|
||||
std::map<std::string, EvdevControllerMapping> loaded_mappings;
|
||||
|
||||
int load_keycode(ConfigFile* cfg, string section, string dc_key)
|
||||
int load_keycode(emucfg::ConfigFile* cfg, string section, string dc_key)
|
||||
{
|
||||
int code = -1;
|
||||
|
||||
|
@ -217,7 +217,7 @@
|
|||
|
||||
EvdevControllerMapping load_mapping(FILE* fd)
|
||||
{
|
||||
ConfigFile mf;
|
||||
emucfg::ConfigFile mf;
|
||||
mf.parse(fd);
|
||||
|
||||
EvdevControllerMapping mapping = {
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
#include "hw/sh4/dyna/ngen.h"
|
||||
#include "hw/sh4/sh4_mem.h"
|
||||
#include "hw/sh4/dyna/regalloc.h"
|
||||
#include "emitter/x86_emitter.h"
|
||||
#include "profiler/profiler.h"
|
||||
#include "oslib/oslib.h"
|
||||
|
||||
|
|
Loading…
Reference in New Issue