Rename memory.cpp to race-memory.cpp

Makefile.common

@@ -36,7 +36,6 @@ endif
 SOURCES_CXX := \
 	$(CORE_DIR)/input.cpp \
 	$(CORE_DIR)/tlcs900h.cpp \
-	$(CORE_DIR)/memory.cpp \
 	$(CORE_DIR)/flash.cpp \
 	$(CORE_DIR)/graphics.cpp \
 	$(CORE_DIR)/main.cpp \
@@ -46,6 +45,7 @@ SOURCES_CXX := \
 	$(CORE_DIR)/libretro/log.cpp
 
 SOURCES_C += \
+	$(CORE_DIR)/race-memory.c \
 	$(CORE_DIR)/ngpBios.c \
 	$(CORE_DIR)/neopopsound.c
 

cz80_support.cpp

@@ -4,7 +4,7 @@
 
 //#include "driver.h"
 //#include "cpuintrf.h"
-#include "memory.h"
+#include "race-memory.h"
 //#include "z80/z80.h"
 #include "cz80.h"
 
@@ -16,8 +16,6 @@ unsigned char *mame4all_cz80_ram = &mainram[0x3000];
 cz80_struc RACE_cz80_struc_alloc;
 cz80_struc *RACE_cz80_struc=&RACE_cz80_struc_alloc;
 
-#include "memory.h"
-
 void Z80_Init()
 {
 	Cz80_Init(RACE_cz80_struc);

flash.cpp

@@ -14,7 +14,7 @@
  */
 
 #include "StdAfx.h"
-#include "memory.h"
+#include "race-memory.h"
 #include "flash.h"
 #include <string.h>
 #ifdef _WIN32

graphics.cpp

@@ -12,7 +12,7 @@
 #include "StdAfx.h"
 #include "main.h"
 #include "graphics.h"
-#include "memory.h"
+#include "race-memory.h"
 
 #if defined(ABGR1555)
 #define RMASK 0x001f

libretro/libretro.cpp

@@ -10,7 +10,7 @@
 #include "../input.h"
 #include "../flash.h"
 #include "../tlcs900h.h"
-#include "../memory.h"
+#include "../race-memory.h"
 #include "../graphics.h"
 #include "../state.h"
 

main.cpp

@@ -16,7 +16,7 @@
 #include "main.h"
 
 
-#include "memory.h"
+#include "race-memory.h"
 #include "tlcs900h.h"
 #include "input.h"
 

memory.cpp → race-memory.cpp

@@ -15,7 +15,7 @@
  */
 
 #include "StdAfx.h"
-#include "memory.h"
+#include "race-memory.h"
 #include "input.h"		/* for Gameboy Input */
 #include "graphics.h"	/* for i/o ports of the game gear */
 #include "tlcs900h.h"

state.cpp

@@ -22,7 +22,7 @@
 #include <string.h>
 #include "state.h"
 #include "tlcs900h.h"
-#include "memory.h"
+#include "race-memory.h"
 
 #ifdef PC
 #undef PC

tlcs900h.cpp

@@ -36,7 +36,7 @@
 #include <time.h>
 #include "main.h"
 #include "tlcs900h.h"
-#include "memory.h"
+#include "race-memory.h"
 #include "input.h"
 #include "graphics.h"
 #include "ngpBios.h"