From 1291256b668e52f9cba9dd1ce6b3f6c70cda54aa Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 22 Oct 2014 00:55:35 +0200
Subject: [PATCH] (360) Build fixes

---
 frontend/platform/platform_xdk.c               |  1 -
 .../RetroArch-Salamander.vcxproj               | 18 ++++++++++++++++--
 .../RetroArch-Salamander.vcxproj.filters       | 12 ++++++------
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/frontend/platform/platform_xdk.c b/frontend/platform/platform_xdk.c
index b7a35f5156..7810928f88 100644
--- a/frontend/platform/platform_xdk.c
+++ b/frontend/platform/platform_xdk.c
@@ -25,7 +25,6 @@
 
 #include "../../conf/config_file.h"
 #include "../../conf/config_file_macros.h"
-#include "../../file.h"
 #include "../../general.h"
 
 static bool exit_spawn;
diff --git a/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj b/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj
index e18d891320..0132ba97a1 100644
--- a/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj
+++ b/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj
@@ -270,7 +270,6 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsCpp</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsCpp</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\..\file_path.c" />
     <ClCompile Include="..\..\dir_list.c" />
     <ClCompile Include="..\..\libretro-sdk\compat\compat.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
@@ -280,11 +279,26 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\..\string_list.c" />
+    <ClCompile Include="..\..\libretro-sdk\file\file_path.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsCpp</CompileAs>
+    </ClCompile>
     <ClCompile Include="..\..\frontend\frontend_salamander.c" />
     <ClCompile Include="..\..\frontend\frontend_context.c" />
     <ClCompile Include="..\..\frontend\platform\platform_null.c" />
     <ClCompile Include="..\..\frontend\platform\platform_xdk.c" />
+    <ClCompile Include="..\..\libretro-sdk\string\string_list.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsCpp</CompileAs>
+    </ClCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj.filters b/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj.filters
index ecae5e01c4..96736ab2f5 100644
--- a/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj.filters
+++ b/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj.filters
@@ -23,15 +23,9 @@
     <ClCompile Include="..\..\conf\config_file.c">
       <Filter>Source Files\conf</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\file_path.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\dir_list.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\string_list.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\frontend\frontend_salamander.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -47,5 +41,11 @@
     <ClCompile Include="..\..\libretro-sdk\compat\compat.c">
       <Filter>Source Files\libretro-sdk\compat</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\libretro-sdk\file\file_path.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libretro-sdk\string\string_list.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file