diff options
| author | 2018-01-20 16:26:20 -0500 | |
|---|---|---|
| committer | 2018-01-20 16:26:20 -0500 | |
| commit | ff883cc56382425d4c4f572ff659ec7df6fc2cec (patch) | |
| tree | 3b7e44f33dac0384d412fed61de3c5ad40db137d /src/core/loader/elf.h | |
| parent | Port citra #3352 to yuzu (#103) (diff) | |
| parent | loader: Clean up ctors and includes. (diff) | |
| download | yuzu-ff883cc56382425d4c4f572ff659ec7df6fc2cec.tar.gz yuzu-ff883cc56382425d4c4f572ff659ec7df6fc2cec.tar.xz yuzu-ff883cc56382425d4c4f572ff659ec7df6fc2cec.zip | |
Merge pull request #119 from bunnei/desconstucted-loader
Separate NSO loading from DesconstuctedRomLoader
Diffstat (limited to 'src/core/loader/elf.h')
| -rw-r--r-- | src/core/loader/elf.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/loader/elf.h b/src/core/loader/elf.h index 113da5917..ee741a789 100644 --- a/src/core/loader/elf.h +++ b/src/core/loader/elf.h | |||
| @@ -16,18 +16,18 @@ namespace Loader { | |||
| 16 | /// Loads an ELF/AXF file | 16 | /// Loads an ELF/AXF file |
| 17 | class AppLoader_ELF final : public AppLoader { | 17 | class AppLoader_ELF final : public AppLoader { |
| 18 | public: | 18 | public: |
| 19 | AppLoader_ELF(FileUtil::IOFile&& file, std::string filename) | 19 | AppLoader_ELF(FileUtil::IOFile&& file, std::string filename); |
| 20 | : AppLoader(std::move(file)), filename(std::move(filename)) {} | ||
| 21 | 20 | ||
| 22 | /** | 21 | /** |
| 23 | * Returns the type of the file | 22 | * Returns the type of the file |
| 24 | * @param file FileUtil::IOFile open file | 23 | * @param file FileUtil::IOFile open file |
| 24 | * @param filepath Path of the file that we are opening. | ||
| 25 | * @return FileType found, or FileType::Error if this loader doesn't know it | 25 | * @return FileType found, or FileType::Error if this loader doesn't know it |
| 26 | */ | 26 | */ |
| 27 | static FileType IdentifyType(FileUtil::IOFile& file); | 27 | static FileType IdentifyType(FileUtil::IOFile& file, const std::string& filepath); |
| 28 | 28 | ||
| 29 | FileType GetFileType() override { | 29 | FileType GetFileType() override { |
| 30 | return IdentifyType(file); | 30 | return IdentifyType(file, filename); |
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | ResultStatus Load(Kernel::SharedPtr<Kernel::Process>& process) override; | 33 | ResultStatus Load(Kernel::SharedPtr<Kernel::Process>& process) override; |