summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/core/loader/loader.cpp8
2 files changed, 9 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a31fb5793..09fe9bcd3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -216,7 +216,7 @@ if (YUZU_USE_BUNDLED_UNICORN)
216 set(LIBUNICORN_LIBRARY "${UNICORN_PREFIX}/lib/x64/unicorn_dynload.lib" CACHE PATH "Path to Unicorn library") 216 set(LIBUNICORN_LIBRARY "${UNICORN_PREFIX}/lib/x64/unicorn_dynload.lib" CACHE PATH "Path to Unicorn library")
217 set(UNICORN_DLL_DIR "${UNICORN_PREFIX}/lib/x64/" CACHE PATH "Path to unicorn.dll") 217 set(UNICORN_DLL_DIR "${UNICORN_PREFIX}/lib/x64/" CACHE PATH "Path to unicorn.dll")
218else() 218else()
219 find_package(unicorn REQUIRED) 219 find_package(Unicorn REQUIRED)
220endif() 220endif()
221 221
222if (UNICORN_FOUND) 222if (UNICORN_FOUND)
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp
index 6fa7afb42..92defd381 100644
--- a/src/core/loader/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -53,6 +53,10 @@ FileType GuessFromExtension(const std::string& extension_) {
53 53
54 if (extension == ".elf" || extension == ".axf") 54 if (extension == ".elf" || extension == ".axf")
55 return FileType::ELF; 55 return FileType::ELF;
56 else if (extension == ".nro")
57 return FileType::NRO;
58 else if (extension == ".nso")
59 return FileType::NSO;
56 60
57 return FileType::Unknown; 61 return FileType::Unknown;
58} 62}
@@ -61,6 +65,10 @@ const char* GetFileTypeString(FileType type) {
61 switch (type) { 65 switch (type) {
62 case FileType::ELF: 66 case FileType::ELF:
63 return "ELF"; 67 return "ELF";
68 case FileType::NRO:
69 return "NRO";
70 case FileType::NSO:
71 return "NSO";
64 case FileType::Error: 72 case FileType::Error:
65 case FileType::Unknown: 73 case FileType::Unknown:
66 break; 74 break;