From 0aca202ae936d3fccbab34f36d9246e0598849a5 Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 16 Jun 2014 18:03:13 -0400 Subject: Loader: Moved elf and loader modules to a "loader" subdirectory. --- src/core/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/core/CMakeLists.txt') diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 7116b88e9..2361fd2e3 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -1,6 +1,7 @@ set(SRCS core.cpp core_timing.cpp - loader.cpp + loader/elf_reader.cpp + loader/loader.cpp mem_map.cpp mem_map_funcs.cpp system.cpp @@ -27,7 +28,6 @@ set(SRCS core.cpp arm/interpreter/mmu/tlb.cpp arm/interpreter/mmu/wb.cpp arm/interpreter/mmu/xscale_copro.cpp - elf/elf_reader.cpp file_sys/directory_file_system.cpp file_sys/meta_file_system.cpp hle/hle.cpp @@ -50,7 +50,9 @@ set(SRCS core.cpp set(HEADERS core.h core_timing.h - loader.h + loader/elf_reader.h + loader/elf_types.h + loader/loader.h mem_map.h system.h arm/disassembler/arm_disasm.h @@ -72,8 +74,6 @@ set(HEADERS core.h arm/interpreter/vfp/asm_vfp.h arm/interpreter/vfp/vfp.h arm/interpreter/vfp/vfp_helper.h - elf/elf_reader.h - elf/elf_types.h file_sys/directory_file_system.h file_sys/file_sys.h file_sys/meta_file_system.h -- cgit v1.2.3 From 3577dd027ddbaa2517eacad700ed0768a1f4b518 Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 16 Jun 2014 22:57:09 -0400 Subject: Loader: Added support for booting NCCH executables. NCCH: Fixed typo in printing NCCH filename. --- src/core/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/core/CMakeLists.txt') diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 2361fd2e3..3f2d99e44 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -2,6 +2,7 @@ set(SRCS core.cpp core_timing.cpp loader/elf_reader.cpp loader/loader.cpp + loader/ncch.cpp mem_map.cpp mem_map_funcs.cpp system.cpp @@ -53,6 +54,7 @@ set(HEADERS core.h loader/elf_reader.h loader/elf_types.h loader/loader.h + loader/ncch.h mem_map.h system.h arm/disassembler/arm_disasm.h -- cgit v1.2.3 From 1da361c7ab55e1dbe6709a738e228bfab5a5bb78 Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 16 Jun 2014 23:05:10 -0400 Subject: Elf: Renamed modules to be consistent with new loader naming, fixed tabs -> spaces. --- src/core/CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/core/CMakeLists.txt') diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 3f2d99e44..634f4d572 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -1,6 +1,6 @@ set(SRCS core.cpp core_timing.cpp - loader/elf_reader.cpp + loader/elf.cpp loader/loader.cpp loader/ncch.cpp mem_map.cpp @@ -51,8 +51,7 @@ set(SRCS core.cpp set(HEADERS core.h core_timing.h - loader/elf_reader.h - loader/elf_types.h + loader/elf.h loader/loader.h loader/ncch.h mem_map.h -- cgit v1.2.3