FEX-Emu/FEX
1
0
Fork 0
mirror of https://github.com/FEX-Emu/FEX.git synced 2025-01-21 22:07:51 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Config: Removes a static vector initializer

Browse Source 
Saw this vector was getting initialized at runtime, sticking around, and
installing an atexit handler. This is completely unnecessary, just use
the OPT_BASE handler directly to walk the environment variable names.
This commit is contained in:
Ryan Houdek 2024-08-03 19:13:29 -07:00
parent 7ffd3e55d5
commit c114279118
No known key found for this signature in database
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Common/Config.cpp
View File

@ -149,11 +149,6 @@ void OptionMapper::MapNameToOption(const char* ConfigName, const char* ConfigStr
}
}
static const fextl::vector<std::pair<const char*, FEXCore::Config::ConfigOption>> EnvConfigLookup = {{
#define OPT_BASE(type, group, enum, json, default) {"FEX_" #enum, FEXCore::Config::ConfigOption::CONFIG_##enum},
#include <FEXCore/Config/ConfigValues.inl>
}};
MainLoader::MainLoader(FEXCore::Config::LayerType Type)
: OptionMapper(Type)
, Config {FEXCore::Config::GetConfigFileLocation(Type == FEXCore::Config::LayerType::LAYER_GLOBAL_MAIN)} {}
@ -229,11 +224,11 @@ void EnvLoader::Load() {
std::optional<std::string_view> Value;
for (auto& it : EnvConfigLookup) {
if ((Value = GetVar(EnvMap, it.first)).has_value()) {
Set(it.second, fextl::string(*Value));
}
}
// Walk all the environment options and corresponding config option.
#define OPT_BASE(type, group, enum, json, default) \
Value = GetVar(EnvMap, "FEX_" #enum); \
if (Value.has_value()) Set(FEXCore::Config::ConfigOption::CONFIG_##enum, fextl::string(*Value));
#include <FEXCore/Config/ConfigValues.inl>
}
fextl::unique_ptr<FEXCore::Config::Layer> CreateGlobalMainLayer() {