From 7f9430f7aee9e7ef11d1bd86a2b98ae239c5be06 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Sun, 5 Aug 2018 18:27:05 -0400 Subject: loader: Make AppLoader_NCA rely on directory loading code Eliminates duplicate code shared between their Load methods, after all the only difference is how the romfs is handled. --- src/core/loader/deconstructed_rom_directory.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/core/loader/deconstructed_rom_directory.h') diff --git a/src/core/loader/deconstructed_rom_directory.h b/src/core/loader/deconstructed_rom_directory.h index 7319ba6ea..7d5433563 100644 --- a/src/core/loader/deconstructed_rom_directory.h +++ b/src/core/loader/deconstructed_rom_directory.h @@ -22,6 +22,9 @@ class AppLoader_DeconstructedRomDirectory final : public AppLoader { public: explicit AppLoader_DeconstructedRomDirectory(FileSys::VirtualFile main_file); + // Overload to accept exefs directory. Must contain 'main' and 'main.npdm' + explicit AppLoader_DeconstructedRomDirectory(FileSys::VirtualDir directory); + /** * Returns the type of the file * @param file std::shared_ptr open file @@ -40,6 +43,7 @@ public: private: FileSys::ProgramMetadata metadata; FileSys::VirtualFile romfs; + FileSys::VirtualDir dir; }; } // namespace Loader -- cgit v1.2.3