From 3124638fac4b5bf200cfb70ddb0cd5a7d896f144 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 17 Mar 2014 18:24:10 +0100
Subject: [PATCH] Uniquely name files for MSVC

---
 Makefile                                   | 4 ++--
 pico/32x/{draw.c => 32x_draw.c}            | 0
 pico/32x/{memory.c => 32x_memory.c}        | 0
 pico/carthw/svp/{memory.c => svp_memory.c} | 0
 pico/cd/{memory.c => cd_memory.c}          | 0
 pico/cd/{misc.c => cd_misc.c}              | 0
 pico/cd/{sek.c => cd_sek.c}                | 0
 platform/common/common.mak                 | 8 ++++----
 8 files changed, 6 insertions(+), 6 deletions(-)
 rename pico/32x/{draw.c => 32x_draw.c} (100%)
 rename pico/32x/{memory.c => 32x_memory.c} (100%)
 rename pico/carthw/svp/{memory.c => svp_memory.c} (100%)
 rename pico/cd/{memory.c => cd_memory.c} (100%)
 rename pico/cd/{misc.c => cd_misc.c} (100%)
 rename pico/cd/{sek.c => cd_sek.c} (100%)

diff --git a/Makefile b/Makefile
index d8dbcb5e..d7a01dfe 100644
--- a/Makefile
+++ b/Makefile
@@ -197,7 +197,7 @@ tools/textfilter: tools/textfilter.c
 pico/draw.o: CFLAGS += -fno-strict-aliasing
 pico/draw2.o: CFLAGS += -fno-strict-aliasing
 pico/mode4.o: CFLAGS += -fno-strict-aliasing
-pico/cd/memory.o: CFLAGS += -fno-strict-aliasing
+pico/cd/cd_memory.o: CFLAGS += -fno-strict-aliasing
 pico/cd/cd_file.o: CFLAGS += -fno-strict-aliasing
 pico/cd/pcm.o: CFLAGS += -fno-strict-aliasing
 pico/cd/LC89510.o: CFLAGS += -fno-strict-aliasing
@@ -208,5 +208,5 @@ pico/carthw/svp/compiler.o : cpu/drc/emit_$(ARCH).c
 cpu/sh2/compiler.o : cpu/drc/emit_$(ARCH).c
 cpu/sh2/mame/sh2pico.o : cpu/sh2/mame/sh2.c
 pico/pico.o pico/cd/mcd.o pico/32x/32x.o : pico/pico_cmn.c pico/pico_int.h
-pico/memory.o pico/cd/memory.o pico/32x/memory.o : pico/pico_int.h pico/memory.h
+pico/memory.o pico/cd/cd_memory.o pico/32x/32x_memory.o : pico/pico_int.h pico/memory.h
 cpu/fame/famec.o: cpu/fame/famec.c cpu/fame/famec_opcodes.h
diff --git a/pico/32x/draw.c b/pico/32x/32x_draw.c
similarity index 100%
rename from pico/32x/draw.c
rename to pico/32x/32x_draw.c
diff --git a/pico/32x/memory.c b/pico/32x/32x_memory.c
similarity index 100%
rename from pico/32x/memory.c
rename to pico/32x/32x_memory.c
diff --git a/pico/carthw/svp/memory.c b/pico/carthw/svp/svp_memory.c
similarity index 100%
rename from pico/carthw/svp/memory.c
rename to pico/carthw/svp/svp_memory.c
diff --git a/pico/cd/memory.c b/pico/cd/cd_memory.c
similarity index 100%
rename from pico/cd/memory.c
rename to pico/cd/cd_memory.c
diff --git a/pico/cd/misc.c b/pico/cd/cd_misc.c
similarity index 100%
rename from pico/cd/misc.c
rename to pico/cd/cd_misc.c
diff --git a/pico/cd/sek.c b/pico/cd/cd_sek.c
similarity index 100%
rename from pico/cd/sek.c
rename to pico/cd/cd_sek.c
diff --git a/platform/common/common.mak b/platform/common/common.mak
index fb59ecf3..d19f16ac 100644
--- a/platform/common/common.mak
+++ b/platform/common/common.mak
@@ -92,13 +92,13 @@ else
 DEFINES += NO_SMS
 endif
 # CD
-SRCS_COMMON += $(R)pico/cd/mcd.c $(R)pico/cd/memory.c $(R)pico/cd/sek.c \
+SRCS_COMMON += $(R)pico/cd/mcd.c $(R)pico/cd/cd_memory.c $(R)pico/cd/cd_sek.c \
 	$(R)pico/cd/cdc.c $(R)pico/cd/cdd.c $(R)pico/cd/cd_image.c \
 	$(R)pico/cd/cue.c $(R)pico/cd/gfx.c $(R)pico/cd/gfx_dma.c \
-	$(R)pico/cd/misc.c $(R)pico/cd/pcm.c
+	$(R)pico/cd/cd_misc.c $(R)pico/cd/pcm.c
 # 32X
 ifneq "$(no_32x)" "1"
-SRCS_COMMON += $(R)pico/32x/32x.c $(R)pico/32x/memory.c $(R)pico/32x/draw.c \
+SRCS_COMMON += $(R)pico/32x/32x.c $(R)pico/32x/32x_memory.c $(R)pico/32x/32x_draw.c \
 	$(R)pico/32x/sh2soc.c $(R)pico/32x/pwm.c
 else
 DEFINES += NO_32X
@@ -108,7 +108,7 @@ SRCS_COMMON += $(R)pico/pico/pico.c $(R)pico/pico/memory.c $(R)pico/pico/xpcm.c
 # carthw
 SRCS_COMMON += $(R)pico/carthw/carthw.c
 # SVP
-SRCS_COMMON += $(R)pico/carthw/svp/svp.c $(R)pico/carthw/svp/memory.c \
+SRCS_COMMON += $(R)pico/carthw/svp/svp.c $(R)pico/carthw/svp/svp_memory.c \
 	$(R)pico/carthw/svp/ssp16.c
 ifeq "$(use_svpdrc)" "1"
 DEFINES += _SVP_DRC
-- 
2.39.5