diff options
| author | 2018-09-20 23:36:11 -0400 | |
|---|---|---|
| committer | 2018-09-20 23:36:11 -0400 | |
| commit | 000da01c1d8ad19435babf40be0a9db283920ecb (patch) | |
| tree | 9560c3efa1052ac4b6d59bd10e950c6e62a76c6d /src | |
| parent | Merge pull request #1372 from lioncash/thread (diff) | |
| parent | yuzu-cmd: Add call to CreateFactories (diff) | |
| download | yuzu-000da01c1d8ad19435babf40be0a9db283920ecb.tar.gz yuzu-000da01c1d8ad19435babf40be0a9db283920ecb.tar.xz yuzu-000da01c1d8ad19435babf40be0a9db283920ecb.zip | |
Merge pull request #1337 from DarkLordZach/create-fs-cmd
yuzu-cmd: Add filesystem service initializer call
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu_cmd/yuzu.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index b1c364fbb..b2559b717 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp | |||
| @@ -20,8 +20,10 @@ | |||
| 20 | #include "common/string_util.h" | 20 | #include "common/string_util.h" |
| 21 | #include "common/telemetry.h" | 21 | #include "common/telemetry.h" |
| 22 | #include "core/core.h" | 22 | #include "core/core.h" |
| 23 | #include "core/crypto/key_manager.h" | ||
| 23 | #include "core/file_sys/vfs_real.h" | 24 | #include "core/file_sys/vfs_real.h" |
| 24 | #include "core/gdbstub/gdbstub.h" | 25 | #include "core/gdbstub/gdbstub.h" |
| 26 | #include "core/hle/service/filesystem/filesystem.h" | ||
| 25 | #include "core/loader/loader.h" | 27 | #include "core/loader/loader.h" |
| 26 | #include "core/settings.h" | 28 | #include "core/settings.h" |
| 27 | #include "core/telemetry_session.h" | 29 | #include "core/telemetry_session.h" |
| @@ -29,7 +31,6 @@ | |||
| 29 | #include "yuzu_cmd/emu_window/emu_window_sdl2.h" | 31 | #include "yuzu_cmd/emu_window/emu_window_sdl2.h" |
| 30 | 32 | ||
| 31 | #include <getopt.h> | 33 | #include <getopt.h> |
| 32 | #include "core/crypto/key_manager.h" | ||
| 33 | #ifndef _MSC_VER | 34 | #ifndef _MSC_VER |
| 34 | #include <unistd.h> | 35 | #include <unistd.h> |
| 35 | #endif | 36 | #endif |
| @@ -169,6 +170,7 @@ int main(int argc, char** argv) { | |||
| 169 | 170 | ||
| 170 | Core::System& system{Core::System::GetInstance()}; | 171 | Core::System& system{Core::System::GetInstance()}; |
| 171 | system.SetFilesystem(std::make_shared<FileSys::RealVfsFilesystem>()); | 172 | system.SetFilesystem(std::make_shared<FileSys::RealVfsFilesystem>()); |
| 173 | Service::FileSystem::CreateFactories(system.GetFilesystem()); | ||
| 172 | 174 | ||
| 173 | SCOPE_EXIT({ system.Shutdown(); }); | 175 | SCOPE_EXIT({ system.Shutdown(); }); |
| 174 | 176 | ||