diff options
| author | 2021-04-14 16:07:40 -0700 | |
|---|---|---|
| committer | 2021-04-14 16:24:03 -0700 | |
| commit | a4c6712a4be249bf668df7f0ff83a0a5236283b2 (patch) | |
| tree | f05e183692b6b1e4096d285fb77db50f048ae82d /src/yuzu_cmd/yuzu.cpp | |
| parent | core: settings: Add setting for debug assertions and disable by default. (diff) | |
| download | yuzu-a4c6712a4be249bf668df7f0ff83a0a5236283b2.tar.gz yuzu-a4c6712a4be249bf668df7f0ff83a0a5236283b2.tar.xz yuzu-a4c6712a4be249bf668df7f0ff83a0a5236283b2.zip | |
common: Move settings to common from core.
- Removes a dependency on core and input_common from common.
Diffstat (limited to 'src/yuzu_cmd/yuzu.cpp')
| -rw-r--r-- | src/yuzu_cmd/yuzu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index 982c41785..b431db659 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include "common/nvidia_flags.h" | 20 | #include "common/nvidia_flags.h" |
| 21 | #include "common/scm_rev.h" | 21 | #include "common/scm_rev.h" |
| 22 | #include "common/scope_exit.h" | 22 | #include "common/scope_exit.h" |
| 23 | #include "common/settings.h" | ||
| 23 | #include "common/string_util.h" | 24 | #include "common/string_util.h" |
| 24 | #include "common/telemetry.h" | 25 | #include "common/telemetry.h" |
| 25 | #include "core/core.h" | 26 | #include "core/core.h" |
| @@ -29,7 +30,6 @@ | |||
| 29 | #include "core/hle/kernel/process.h" | 30 | #include "core/hle/kernel/process.h" |
| 30 | #include "core/hle/service/filesystem/filesystem.h" | 31 | #include "core/hle/service/filesystem/filesystem.h" |
| 31 | #include "core/loader/loader.h" | 32 | #include "core/loader/loader.h" |
| 32 | #include "core/settings.h" | ||
| 33 | #include "core/telemetry_session.h" | 33 | #include "core/telemetry_session.h" |
| 34 | #include "input_common/main.h" | 34 | #include "input_common/main.h" |
| 35 | #include "video_core/renderer_base.h" | 35 | #include "video_core/renderer_base.h" |
| @@ -164,7 +164,7 @@ int main(int argc, char** argv) { | |||
| 164 | InputCommon::InputSubsystem input_subsystem; | 164 | InputCommon::InputSubsystem input_subsystem; |
| 165 | 165 | ||
| 166 | // Apply the command line arguments | 166 | // Apply the command line arguments |
| 167 | Settings::Apply(system); | 167 | system.ApplySettings(); |
| 168 | 168 | ||
| 169 | std::unique_ptr<EmuWindow_SDL2> emu_window; | 169 | std::unique_ptr<EmuWindow_SDL2> emu_window; |
| 170 | switch (Settings::values.renderer_backend.GetValue()) { | 170 | switch (Settings::values.renderer_backend.GetValue()) { |