From d0650fc17b57ed9385cb22b29352ba4d53843126 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 22 Oct 2014 01:03:29 +0200
Subject: [PATCH] (360) Salamander build fix

---
 libretro-sdk/file/file_path.c                          | 10 +++++-----
 .../RetroArch-Salamander.vcxproj                       |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libretro-sdk/file/file_path.c b/libretro-sdk/file/file_path.c
index 14604a0f17..bfe2624588 100644
--- a/libretro-sdk/file/file_path.c
+++ b/libretro-sdk/file/file_path.c
@@ -208,8 +208,9 @@ void fill_pathname_slash(char *path, size_t size)
 void fill_pathname_dir(char *in_dir, const char *in_basename,
       const char *replace, size_t size)
 {
+   const char *base = NULL;
    fill_pathname_slash(in_dir, size);
-   const char *base = path_basename(in_basename);
+   base = path_basename(in_basename);
    rarch_assert(strlcat(in_dir, base, size) < size);
    rarch_assert(strlcat(in_dir, replace, size) < size);
 }
@@ -269,11 +270,10 @@ void fill_dated_filename(char *out_filename,
 
 void path_basedir(char *path)
 {
+   char *last = NULL;
    if (strlen(path) < 2)
       return;
 
-   char *last;
-
 #ifdef HAVE_COMPRESSION
    /* We want to find the directory with the zipfile in basedir. */
    last = strchr(path,'#');
@@ -490,11 +490,11 @@ void fill_pathname_expand_special(char *out_path,
 void fill_short_pathname_representation(char* out_rep,
       const char *in_path, size_t size)
 {
-   char path_short[PATH_MAX];
+   char path_short[PATH_MAX], *last_hash = NULL;
    fill_pathname(path_short, path_basename(in_path), "",
             sizeof(path_short));
 
-   char* last_hash = strchr(path_short,'#');
+   last_hash = (char*)strchr(path_short,'#');
    /* We handle paths like:
     * /path/to/file.7z#mygame.img
     * short_name: mygame.img:
diff --git a/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj b/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj
index 0132ba97a1..65ec975cc1 100644
--- a/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj
+++ b/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj
@@ -285,7 +285,7 @@
       <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>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs>
     </ClCompile>
     <ClCompile Include="..\..\frontend\frontend_salamander.c" />
     <ClCompile Include="..\..\frontend\frontend_context.c" />
@@ -297,7 +297,7 @@
       <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>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs>
     </ClCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />