summaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorGravatar Zach Hilman2018-07-06 10:51:32 -0400
committerGravatar bunnei2018-07-06 10:51:32 -0400
commit77c684c1140f6bf3fb7d4560d06d2efb1a2ee5e2 (patch)
tree38ef6451732c5eecb0efdd198f3db4d33848453c /src/core/core.cpp
parentMerge pull request #629 from Subv/depth_test (diff)
downloadyuzu-77c684c1140f6bf3fb7d4560d06d2efb1a2ee5e2.tar.gz
yuzu-77c684c1140f6bf3fb7d4560d06d2efb1a2ee5e2.tar.xz
yuzu-77c684c1140f6bf3fb7d4560d06d2efb1a2ee5e2.zip
Virtual Filesystem (#597)
* Add VfsFile and VfsDirectory classes * Finish abstract Vfs classes * Implement RealVfsFile (computer fs backend) * Finish RealVfsFile and RealVfsDirectory * Finished OffsetVfsFile * More changes * Fix import paths * Major refactor * Remove double const * Use experimental/filesystem or filesystem depending on compiler * Port partition_filesystem * More changes * More Overhaul * FSP_SRV fixes * Fixes and testing * Try to get filesystem to compile * Filesystem on linux * Remove std::filesystem and document/test * Compile fixes * Missing include * Bug fixes * Fixes * Rename v_file and v_dir * clang-format fix * Rename NGLOG_* to LOG_* * Most review changes * Fix TODO * Guess 'main' to be Directory by filename
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r--src/core/core.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 8335d502e..82db5cccf 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -19,6 +19,7 @@
19#include "core/loader/loader.h" 19#include "core/loader/loader.h"
20#include "core/memory_setup.h" 20#include "core/memory_setup.h"
21#include "core/settings.h" 21#include "core/settings.h"
22#include "file_sys/vfs_real.h"
22#include "video_core/video_core.h" 23#include "video_core/video_core.h"
23 24
24namespace Core { 25namespace Core {
@@ -84,7 +85,7 @@ System::ResultStatus System::SingleStep() {
84} 85}
85 86
86System::ResultStatus System::Load(EmuWindow* emu_window, const std::string& filepath) { 87System::ResultStatus System::Load(EmuWindow* emu_window, const std::string& filepath) {
87 app_loader = Loader::GetLoader(filepath); 88 app_loader = Loader::GetLoader(std::make_shared<FileSys::RealVfsFile>(filepath));
88 89
89 if (!app_loader) { 90 if (!app_loader) {
90 LOG_CRITICAL(Core, "Failed to obtain loader for {}!", filepath); 91 LOG_CRITICAL(Core, "Failed to obtain loader for {}!", filepath);