summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortwinaphex2014-12-10 05:05:41 +0100
committertwinaphex2014-12-10 05:05:41 +0100
commita16cbdc4163e895323c1b92ff5ff7f4e925a99b5 (patch)
treecf73b4ad2e2f10910138dfdc99ce3e9eff543128
parent26e7362de8ec0ffe6c2cc59eb3d869c6bdef3e6f (diff)
downloadpicogpsp-a16cbdc4163e895323c1b92ff5ff7f4e925a99b5.tar.gz
picogpsp-a16cbdc4163e895323c1b92ff5ff7f4e925a99b5.tar.bz2
picogpsp-a16cbdc4163e895323c1b92ff5ff7f4e925a99b5.zip
Rename memory.c to gba_memory.c
-rw-r--r--Makefile.common2
-rw-r--r--gba_memory.c (renamed from memory.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.common b/Makefile.common
index 39dd9e9..aef6d23 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -7,7 +7,7 @@ SOURCES_C := $(CORE_DIR)/gpsp_griffin.c
else
SOURCES_C := $(CORE_DIR)/main.c \
$(CORE_DIR)/cpu.c \
- $(CORE_DIR)/memory.c \
+ $(CORE_DIR)/gba_memory.c \
$(CORE_DIR)/video.c \
$(CORE_DIR)/input.c \
$(CORE_DIR)/sound.c \
diff --git a/memory.c b/gba_memory.c
index b93e928..b93e928 100644
--- a/memory.c
+++ b/gba_memory.c