From 390d198812650f4490d219adbbe14d8ab05f3f31 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 16 Apr 2014 15:48:33 +0200
Subject: [PATCH] Uniquely name gfx/scaler/filter.c for MSVC

---
 Makefile                                          | 2 +-
 Makefile.emscripten                               | 2 +-
 Makefile.win                                      | 2 +-
 gfx/scaler/{filter.c => scaler_filter.c}          | 0
 griffin/griffin.c                                 | 2 +-
 msvc/msvc-2010/RetroArch-msvc2010.vcxproj         | 4 ++--
 msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename gfx/scaler/{filter.c => scaler_filter.c} (100%)

diff --git a/Makefile b/Makefile
index 2037456f97..0f08d70c32 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ OBJ = frontend/frontend.o \
 		gfx/shader_parse.o \
 		gfx/scaler/pixconv.o \
 		gfx/scaler/scaler_int.o \
-		gfx/scaler/filter.o \
+		gfx/scaler/scaler_filter.o \
 		gfx/image/image.o \
 		gfx/fonts/fonts.o \
 		gfx/fonts/bitmapfont.o \
diff --git a/Makefile.emscripten b/Makefile.emscripten
index 05ed0f17d8..885a7edae3 100644
--- a/Makefile.emscripten
+++ b/Makefile.emscripten
@@ -30,7 +30,7 @@ OBJ = frontend/platform/platform_emscripten.o \
 		gfx/scaler/scaler.o \
 		gfx/scaler/pixconv.o \
 		gfx/scaler/scaler_int.o \
-		gfx/scaler/filter.o \
+		gfx/scaler/scaler_filter.o \
 		gfx/state_tracker.o \
 		gfx/shader_parse.o \
 		gfx/fonts/fonts.o \
diff --git a/Makefile.win b/Makefile.win
index fb75ce499d..4473c150b4 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -35,7 +35,7 @@ OBJ = frontend/frontend.o \
 		gfx/scaler/scaler.o \
 		gfx/scaler/pixconv.o \
 		gfx/scaler/scaler_int.o \
-		gfx/scaler/filter.o \
+		gfx/scaler/scaler_filter.o \
 		gfx/state_tracker.o \
 		gfx/shader_parse.o \
 		gfx/fonts/fonts.o \
diff --git a/gfx/scaler/filter.c b/gfx/scaler/scaler_filter.c
similarity index 100%
rename from gfx/scaler/filter.c
rename to gfx/scaler/scaler_filter.c
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 9e6de88d20..74a1a4dd3c 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -467,7 +467,7 @@ DRIVERS
 /*============================================================
 SCALERS
 ============================================================ */
-#include "../gfx/scaler/filter.c"
+#include "../gfx/scaler/scaler_filter.c"
 #include "../gfx/scaler/pixconv.c"
 #include "../gfx/scaler/scaler.c"
 #include "../gfx/scaler/scaler_int.c"
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
index d641cffa33..6b3d085fc1 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
@@ -282,7 +282,7 @@
     </ClCompile>
     <ClCompile Include="..\..\gfx\math\matrix_3x3.c">
     </ClCompile>
-    <ClCompile Include="..\..\gfx\scaler\filter.c">
+    <ClCompile Include="..\..\gfx\scaler\scaler_filter.c">
     </ClCompile>
     <ClCompile Include="..\..\gfx\scaler\pixconv.c">
     </ClCompile>
@@ -334,4 +334,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
index 5bb13c2283..582a40883e 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
@@ -131,7 +131,7 @@
     <ClCompile Include="..\..\gfx\scaler\scaler_int.c">
       <Filter>gfx\scaler</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\gfx\scaler\filter.c">
+    <ClCompile Include="..\..\gfx\scaler\scaler_filter.c">
       <Filter>gfx\scaler</Filter>
     </ClCompile>
     <ClCompile Include="..\..\gfx\d3d9\render_chain.cpp">
@@ -298,4 +298,4 @@
       <UniqueIdentifier>{bc290b55-620e-4351-b3b8-4d7a0a3b8792}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>