steam-frame/FEX-Emu--FEX
1
0 Fork 0
mirror of https://github.com/FEX-Emu/FEX.git synced 2026-10-06 13:00:15 +02:00
Code Issues Packages Projects Releases 66 Wiki Activity

Merge pull request #878 from Sonicadvance1/fexconfig_actual_default

Browse Source 
Changes FEXConfig to actually load default configuration
This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis authored and GitHub committed 2021-03-22 18:24:57 +02:00
2 parents fbc49c1648 0c48f1409e
commit 82c2b49a2e
3 files changed
+9 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

External/FEXCore/include/FEXCore/Config/Config.h
Vendored
+2
View File
@@ -39,11 +39,13 @@ namespace DefaultValues {
#define P(x) x
#define OPT_BASE(type, group, enum, json, env, default) constexpr P(type) P(enum) = P(default);
#define OPT_STR(group, enum, json, env, default) const std::string P(enum) = P(default);
#define OPT_STRARRAY(group, enum, json, env, default) OPT_STR(group, enum, json, env, default)
#include <FEXCore/Config/ConfigValues.inl>
namespace Type {
#define OPT_BASE(type, group, enum, json, env, default) using P(enum) = P(type);
#define OPT_STR(group, enum, json, env, default) using P(enum) = std::string;
#define OPT_STRARRAY(group, enum, json, env, default) OPT_STR(group, enum, json, env, default)
#include <FEXCore/Config/ConfigValues.inl>
}
#define FEX_CONFIG_OPT(name, enum) \
External/FEXCore/include/FEXCore/Config/ConfigValues.inl
Vendored
+1 -1
View File
@@ -40,7 +40,7 @@ OPT_STR (EMULATION, THUNKHOSTLIBSPATH, ThunkHostLibs, THUNKHOSTLIBS, "")
OPT_STR (EMULATION, THUNKGUESTLIBSPATH, ThunkGuestLibs, THUNKGUESTLIBS, "")
OPT_STR (EMULATION, THUNKCONFIGPATH, ThunkConfig, THUNKCONFIG, "")
OPT_STR (EMULATION, ENVIRONMENT, Env, ENV, "")
OPT_STRARRAY (EMULATION, ENVIRONMENT, Env, ENV, "")
OPT_BOOL (DEBUG, SINGLESTEP, SingleStep, SINGLESTEP, false)
OPT_BOOL (DEBUG, GDBSERVER, GdbServer, GDBSERVER, false)
Source/Tools/FEXConfig/Main.cpp
+6 -21
View File
@@ -56,27 +56,12 @@ namespace {
ConfigOpen = true;
ConfigFilename = {};
LoadedConfig = std::make_unique<FEX::Config::EmptyMapper>();
LoadedConfig->Set(FEXCore::Config::ConfigOption::CONFIG_DEFAULTCORE, "1");
LoadedConfig->Set(FEXCore::Config::ConfigOption::CONFIG_MAXBLOCKINST, "5000");
LoadedConfig->Set(FEXCore::Config::ConfigOption::CONFIG_SINGLESTEP, "0");
LoadedConfig->Set(FEXCore::Config::ConfigOption::CONFIG_MULTIBLOCK, "1");
LoadedConfig->Set(FEXCore::Config::ConfigOption::CONFIG_GDBSERVER, "0");
LoadedConfig->Set(FEXCore::Config::ConfigOption::CONFIG_EMULATED_CPU_CORES, "1");
LoadedConfig->Set(FEXCore::Config::ConfigOption::CONFIG_ROOTFSPATH, "");
LoadedConfig->Set(FEXCore::Config::ConfigOption::CONFIG_THUNKHOSTLIBSPATH, "");
LoadedConfig->Set(FEXCore::Config::ConfigOption::CONFIG_THUNKGUESTLIBSPATH, "");
LoadedConfig->Set(FEXCore::Config::ConfigOption::CONFIG_THUNKCONFIGPATH, "");
LoadedConfig->Set(FEXCore::Config::ConfigOption::CONFIG_SILENTLOGS, "0");
LoadedConfig->Set(FEXCore::Config::ConfigOption::CONFIG_ENVIRONMENT, "GALLIUM_THREAD=1");
LoadedConfig->Set(FEXCore::Config::ConfigOption::CONFIG_ENVIRONMENT, "GALLIUM_HUD=fps");
LoadedConfig->Set(FEXCore::Config::ConfigOption::CONFIG_ENVIRONMENT, "TERM=xterm");
LoadedConfig->Set(FEXCore::Config::ConfigOption::CONFIG_OUTPUTLOG, "");
LoadedConfig->Set(FEXCore::Config::ConfigOption::CONFIG_DUMPIR, "no"),
LoadedConfig->Set(FEXCore::Config::ConfigOption::CONFIG_TSO_ENABLED, "1");
LoadedConfig->Set(FEXCore::Config::ConfigOption::CONFIG_SMC_CHECKS, "0");
LoadedConfig->Set(FEXCore::Config::ConfigOption::CONFIG_ABI_LOCAL_FLAGS, "0");
LoadedConfig->Set(FEXCore::Config::ConfigOption::CONFIG_ABI_NO_PF, "0");
LoadedConfig->Set(FEXCore::Config::ConfigOption::CONFIG_DEBUG_DISABLE_OPTIMIZATION_PASSES, "0");
#define OPT_BASE(type, group, enum, json, env, default) \
LoadedConfig->Set(FEXCore::Config::ConfigOption::CONFIG_##enum, std::to_string(default));
#define OPT_STR(group, enum, json, env, default) \
LoadedConfig->Set(FEXCore::Config::ConfigOption::CONFIG_##enum, default);
#define OPT_STRARRAY(group, enum, json, env, default) // Do nothing
#include <FEXCore/Config/ConfigValues.inl>
}
void SaveFile(std::string Filename) {