early-access version 2886
This commit is contained in:
parent
d431b7d2f6
commit
f23ace47e6
@ -1,7 +1,7 @@
|
|||||||
yuzu emulator early access
|
yuzu emulator early access
|
||||||
=============
|
=============
|
||||||
|
|
||||||
This is the source code for early-access 2885.
|
This is the source code for early-access 2886.
|
||||||
|
|
||||||
## Legal Notice
|
## Legal Notice
|
||||||
|
|
||||||
|
@ -729,8 +729,6 @@ add_library(core STATIC
|
|||||||
internal_network/sockets.h
|
internal_network/sockets.h
|
||||||
loader/deconstructed_rom_directory.cpp
|
loader/deconstructed_rom_directory.cpp
|
||||||
loader/deconstructed_rom_directory.h
|
loader/deconstructed_rom_directory.h
|
||||||
loader/elf.cpp
|
|
||||||
loader/elf.h
|
|
||||||
loader/kip.cpp
|
loader/kip.cpp
|
||||||
loader/kip.h
|
loader/kip.h
|
||||||
loader/loader.cpp
|
loader/loader.cpp
|
||||||
|
@ -12,7 +12,6 @@
|
|||||||
#include "core/core.h"
|
#include "core/core.h"
|
||||||
#include "core/hle/kernel/k_process.h"
|
#include "core/hle/kernel/k_process.h"
|
||||||
#include "core/loader/deconstructed_rom_directory.h"
|
#include "core/loader/deconstructed_rom_directory.h"
|
||||||
#include "core/loader/elf.h"
|
|
||||||
#include "core/loader/kip.h"
|
#include "core/loader/kip.h"
|
||||||
#include "core/loader/nax.h"
|
#include "core/loader/nax.h"
|
||||||
#include "core/loader/nca.h"
|
#include "core/loader/nca.h"
|
||||||
@ -39,8 +38,6 @@ std::optional<FileType> IdentifyFileLoader(FileSys::VirtualFile file) {
|
|||||||
FileType IdentifyFile(FileSys::VirtualFile file) {
|
FileType IdentifyFile(FileSys::VirtualFile file) {
|
||||||
if (const auto romdir_type = IdentifyFileLoader<AppLoader_DeconstructedRomDirectory>(file)) {
|
if (const auto romdir_type = IdentifyFileLoader<AppLoader_DeconstructedRomDirectory>(file)) {
|
||||||
return *romdir_type;
|
return *romdir_type;
|
||||||
} else if (const auto elf_type = IdentifyFileLoader<AppLoader_ELF>(file)) {
|
|
||||||
return *elf_type;
|
|
||||||
} else if (const auto nso_type = IdentifyFileLoader<AppLoader_NSO>(file)) {
|
} else if (const auto nso_type = IdentifyFileLoader<AppLoader_NSO>(file)) {
|
||||||
return *nso_type;
|
return *nso_type;
|
||||||
} else if (const auto nro_type = IdentifyFileLoader<AppLoader_NRO>(file)) {
|
} else if (const auto nro_type = IdentifyFileLoader<AppLoader_NRO>(file)) {
|
||||||
@ -69,8 +66,6 @@ FileType GuessFromFilename(const std::string& name) {
|
|||||||
const std::string extension =
|
const std::string extension =
|
||||||
Common::ToLower(std::string(Common::FS::GetExtensionFromFilename(name)));
|
Common::ToLower(std::string(Common::FS::GetExtensionFromFilename(name)));
|
||||||
|
|
||||||
if (extension == "elf")
|
|
||||||
return FileType::ELF;
|
|
||||||
if (extension == "nro")
|
if (extension == "nro")
|
||||||
return FileType::NRO;
|
return FileType::NRO;
|
||||||
if (extension == "nso")
|
if (extension == "nso")
|
||||||
@ -89,8 +84,6 @@ FileType GuessFromFilename(const std::string& name) {
|
|||||||
|
|
||||||
std::string GetFileTypeString(FileType type) {
|
std::string GetFileTypeString(FileType type) {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case FileType::ELF:
|
|
||||||
return "ELF";
|
|
||||||
case FileType::NRO:
|
case FileType::NRO:
|
||||||
return "NRO";
|
return "NRO";
|
||||||
case FileType::NSO:
|
case FileType::NSO:
|
||||||
@ -208,10 +201,6 @@ static std::unique_ptr<AppLoader> GetFileLoader(Core::System& system, FileSys::V
|
|||||||
FileType type, u64 program_id,
|
FileType type, u64 program_id,
|
||||||
std::size_t program_index) {
|
std::size_t program_index) {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
// Standard ELF file format.
|
|
||||||
case FileType::ELF:
|
|
||||||
return std::make_unique<AppLoader_ELF>(std::move(file));
|
|
||||||
|
|
||||||
// NX NSO file format.
|
// NX NSO file format.
|
||||||
case FileType::NSO:
|
case FileType::NSO:
|
||||||
return std::make_unique<AppLoader_NSO>(std::move(file));
|
return std::make_unique<AppLoader_NSO>(std::move(file));
|
||||||
|
@ -34,7 +34,6 @@ namespace Loader {
|
|||||||
enum class FileType {
|
enum class FileType {
|
||||||
Error,
|
Error,
|
||||||
Unknown,
|
Unknown,
|
||||||
ELF,
|
|
||||||
NSO,
|
NSO,
|
||||||
NRO,
|
NRO,
|
||||||
NCA,
|
NCA,
|
||||||
|
Loading…
Reference in New Issue
Block a user