diff options
| author |  bunnei | 2018-01-16 17:23:33 -0500 |
|---|---|---|
| committer |  GitHub | 2018-01-16 17:23:33 -0500 |
| commit | 52fe15278b812a2518dd874f29c0829b221fd70f (patch) | |
| tree | 6bf8782b9338d94938e4060c8a3c88855d68ee75 /src/core/loader/nso.cpp | |
| parent | Merge pull request #48 from spycrab/cmake_python (diff) | |
| parent | clang-format (diff) | |
| download | yuzu-52fe15278b812a2518dd874f29c0829b221fd70f.tar.gz yuzu-52fe15278b812a2518dd874f29c0829b221fd70f.tar.xz yuzu-52fe15278b812a2518dd874f29c0829b221fd70f.zip | |
Merge pull request #47 from MerryMage/build-fixes
Misc build fixes
Diffstat (limited to 'src/core/loader/nso.cpp')
| -rw-r--r-- | src/core/loader/nso.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp index 7e1953701..a7d714bc8 100644 --- a/src/core/loader/nso.cpp +++ b/src/core/loader/nso.cpp | |||
| @@ -157,7 +157,8 @@ ResultStatus AppLoader_NSO::Load(Kernel::SharedPtr<Kernel::Process>& process) { | |||
| 157 | 157 | ||
| 158 | // Load NSO modules | 158 | // Load NSO modules |
| 159 | VAddr next_load_addr{Memory::PROCESS_IMAGE_VADDR}; | 159 | VAddr next_load_addr{Memory::PROCESS_IMAGE_VADDR}; |
| 160 | for (const auto& module : {"rtld", "sdk", "subsdk0", "subsdk1", "subsdk2", "subsdk3", "subsdk4"}) { | 160 | for (const auto& module : |
| 161 | {"rtld", "sdk", "subsdk0", "subsdk1", "subsdk2", "subsdk3", "subsdk4"}) { | ||
| 161 | const std::string path = filepath.substr(0, filepath.find_last_of("/\\")) + "/" + module; | 162 | const std::string path = filepath.substr(0, filepath.find_last_of("/\\")) + "/" + module; |
| 162 | const VAddr load_addr = next_load_addr; | 163 | const VAddr load_addr = next_load_addr; |
| 163 | next_load_addr = LoadNso(path, load_addr); | 164 | next_load_addr = LoadNso(path, load_addr); |