diff options
| author | Charles Lombardo <clombardo169@gmail.com> | 2023-11-24 22:59:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-24 22:59:55 -0500 |
| commit | 5a182f4e7ccfac696cd54542089c880d002f5cc9 (patch) | |
| tree | e1bcd72f38f4f57ff6b915022268b0feb86a7937 /src/yuzu_cmd/yuzu.cpp | |
| parent | 093eb075a686d3584f59b129a200c2652a5cdb10 (diff) | |
| parent | dda187d300de379abc4f4e17b5fd73a4eed8d956 (diff) | |
Merge pull request #11889 from t895/ini-lib
configuration: Unify config handling across frontends
Diffstat (limited to 'src/yuzu_cmd/yuzu.cpp')
| -rw-r--r-- | src/yuzu_cmd/yuzu.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index 087cfaa26..0416d5951 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp @@ -29,10 +29,11 @@ #include "core/hle/service/filesystem/filesystem.h" #include "core/loader/loader.h" #include "core/telemetry_session.h" +#include "frontend_common/config.h" #include "input_common/main.h" #include "network/network.h" +#include "sdl_config.h" #include "video_core/renderer_base.h" -#include "yuzu_cmd/config.h" #include "yuzu_cmd/emu_window/emu_window_sdl2.h" #include "yuzu_cmd/emu_window/emu_window_sdl2_gl.h" #include "yuzu_cmd/emu_window/emu_window_sdl2_null.h" @@ -300,7 +301,7 @@ int main(int argc, char** argv) { } } - Config config{config_path}; + SdlConfig config{config_path}; // apply the log_filter setting // the logger was initialized before and doesn't pick up the filter on its own |