aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/loader/loader.cpp
diff options
context:
space:
mode:
authorGravatar bunnei <ericbunnie@gmail.com>2014-06-16 22:57:09 -0400
committerGravatar bunnei <ericbunnie@gmail.com>2014-06-16 23:43:29 -0400
commit3577dd027ddbaa2517eacad700ed0768a1f4b518 (patch)
tree4ddf41f874385673ed1e1e1396b3731e67810318 /src/core/loader/loader.cpp
parent0aca202ae936d3fccbab34f36d9246e0598849a5 (diff)
Loader: Added support for booting NCCH executables.
NCCH: Fixed typo in printing NCCH filename.
Diffstat (limited to 'src/core/loader/loader.cpp')
-rw-r--r--src/core/loader/loader.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp
index 7e6922e0..41fa9c32 100644
--- a/src/core/loader/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -7,6 +7,7 @@
#include "core/loader/loader.h"
#include "core/loader/elf_reader.h"
+#include "core/loader/ncch.h"
#include "core/system.h"
#include "core/core.h"
#include "core/hle/kernel/kernel.h"
@@ -165,6 +166,10 @@ bool LoadFile(std::string &filename, std::string *error_string) {
case FILETYPE_CTR_BIN:
return Load_BIN(filename);
+ case FILETYPE_CTR_CXI:
+ case FILETYPE_CTR_CCI:
+ return Loader::Load_NCCH(filename, error_string);
+
case FILETYPE_ERROR:
ERROR_LOG(LOADER, "Could not read file");
*error_string = "Error reading file";