Merge pull request #762 from yuriks/memmap

Memory: Use a table based lookup scheme to read from memory regions

1 files changed, 3 insertions, 1 deletions

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index ebedcb71..e8d8c96d 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -99,7 +99,7 @@ set(SRCS
             loader/loader.cpp
             loader/ncch.cpp
             mem_map.cpp
-            mem_map_funcs.cpp
+            memory.cpp
             settings.cpp
             system.cpp
             )
@@ -211,6 +211,8 @@ set(HEADERS
             loader/loader.h
             loader/ncch.h
             mem_map.h
+            memory.h
+            memory_setup.h
             settings.h
             system.h
             )