From 7fa59c7f6a0eeb8a5873834ba630c160a1d6a58d Mon Sep 17 00:00:00 2001
From: TwinAphex51224 <twinaphex1@gmail.com>
Date: Sun, 22 Apr 2012 00:27:54 +0200
Subject: [PATCH] (360) 360 port mostly works again - some small things to take
 care of

---
 ...ser.xui => rarch_libretrocore_browser.xui} |  0
 msvc-360/SSNES-360/SSNES-360.sln              | 48 -------------------
 msvc-360/SSNES-360/SSNES-360.vcxproj          |  4 +-
 msvc-360/SSNES-360/SSNES-360.vcxproj.filters  |  8 +++-
 .../SSNES-Salamander/SSNES-Salamander.vcxproj |  1 +
 5 files changed, 9 insertions(+), 52 deletions(-)
 rename 360/media/sd/{ssnes_libretrocore_browser.xui => rarch_libretrocore_browser.xui} (100%)
 delete mode 100644 msvc-360/SSNES-360/SSNES-360.sln

diff --git a/360/media/sd/ssnes_libretrocore_browser.xui b/360/media/sd/rarch_libretrocore_browser.xui
similarity index 100%
rename from 360/media/sd/ssnes_libretrocore_browser.xui
rename to 360/media/sd/rarch_libretrocore_browser.xui
diff --git a/msvc-360/SSNES-360/SSNES-360.sln b/msvc-360/SSNES-360/SSNES-360.sln
deleted file mode 100644
index 0ee4efb821..0000000000
--- a/msvc-360/SSNES-360/SSNES-360.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SSNES-360", "SSNES-360.vcxproj", "{9CE8EEF7-CC1C-4A04-BB5C-62411CB5BADE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SSNES-Salamander", "..\SSNES-Salamander\SSNES-Salamander.vcxproj", "{29D5B973-F267-4039-84E7-8D34E9D00800}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		CodeAnalysis|Xbox 360 = CodeAnalysis|Xbox 360
-		Debug|Xbox 360 = Debug|Xbox 360
-		Profile_FastCap|Xbox 360 = Profile_FastCap|Xbox 360
-		Profile|Xbox 360 = Profile|Xbox 360
-		Release_LTCG|Xbox 360 = Release_LTCG|Xbox 360
-		Release|Xbox 360 = Release|Xbox 360
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9CE8EEF7-CC1C-4A04-BB5C-62411CB5BADE}.CodeAnalysis|Xbox 360.ActiveCfg = CodeAnalysis|Xbox 360
-		{9CE8EEF7-CC1C-4A04-BB5C-62411CB5BADE}.CodeAnalysis|Xbox 360.Build.0 = CodeAnalysis|Xbox 360
-		{9CE8EEF7-CC1C-4A04-BB5C-62411CB5BADE}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
-		{9CE8EEF7-CC1C-4A04-BB5C-62411CB5BADE}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
-		{9CE8EEF7-CC1C-4A04-BB5C-62411CB5BADE}.Profile_FastCap|Xbox 360.ActiveCfg = Profile_FastCap|Xbox 360
-		{9CE8EEF7-CC1C-4A04-BB5C-62411CB5BADE}.Profile_FastCap|Xbox 360.Build.0 = Profile_FastCap|Xbox 360
-		{9CE8EEF7-CC1C-4A04-BB5C-62411CB5BADE}.Profile|Xbox 360.ActiveCfg = Profile|Xbox 360
-		{9CE8EEF7-CC1C-4A04-BB5C-62411CB5BADE}.Profile|Xbox 360.Build.0 = Profile|Xbox 360
-		{9CE8EEF7-CC1C-4A04-BB5C-62411CB5BADE}.Release_LTCG|Xbox 360.ActiveCfg = Release_LTCG|Xbox 360
-		{9CE8EEF7-CC1C-4A04-BB5C-62411CB5BADE}.Release_LTCG|Xbox 360.Build.0 = Release_LTCG|Xbox 360
-		{9CE8EEF7-CC1C-4A04-BB5C-62411CB5BADE}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
-		{9CE8EEF7-CC1C-4A04-BB5C-62411CB5BADE}.Release|Xbox 360.Build.0 = Release|Xbox 360
-		{9CE8EEF7-CC1C-4A04-BB5C-62411CB5BADE}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
-		{29D5B973-F267-4039-84E7-8D34E9D00800}.CodeAnalysis|Xbox 360.ActiveCfg = CodeAnalysis|Xbox 360
-		{29D5B973-F267-4039-84E7-8D34E9D00800}.CodeAnalysis|Xbox 360.Build.0 = CodeAnalysis|Xbox 360
-		{29D5B973-F267-4039-84E7-8D34E9D00800}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
-		{29D5B973-F267-4039-84E7-8D34E9D00800}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
-		{29D5B973-F267-4039-84E7-8D34E9D00800}.Profile_FastCap|Xbox 360.ActiveCfg = Profile_FastCap|Xbox 360
-		{29D5B973-F267-4039-84E7-8D34E9D00800}.Profile_FastCap|Xbox 360.Build.0 = Profile_FastCap|Xbox 360
-		{29D5B973-F267-4039-84E7-8D34E9D00800}.Profile|Xbox 360.ActiveCfg = Profile|Xbox 360
-		{29D5B973-F267-4039-84E7-8D34E9D00800}.Profile|Xbox 360.Build.0 = Profile|Xbox 360
-		{29D5B973-F267-4039-84E7-8D34E9D00800}.Release_LTCG|Xbox 360.ActiveCfg = Release_LTCG|Xbox 360
-		{29D5B973-F267-4039-84E7-8D34E9D00800}.Release_LTCG|Xbox 360.Build.0 = Release_LTCG|Xbox 360
-		{29D5B973-F267-4039-84E7-8D34E9D00800}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
-		{29D5B973-F267-4039-84E7-8D34E9D00800}.Release|Xbox 360.Build.0 = Release|Xbox 360
-		{29D5B973-F267-4039-84E7-8D34E9D00800}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/msvc-360/SSNES-360/SSNES-360.vcxproj b/msvc-360/SSNES-360/SSNES-360.vcxproj
index 1113aa9828..3ee284a292 100644
--- a/msvc-360/SSNES-360/SSNES-360.vcxproj
+++ b/msvc-360/SSNES-360/SSNES-360.vcxproj
@@ -29,6 +29,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{9CE8EEF7-CC1C-4A04-BB5C-62411CB5BADE}</ProjectGuid>
     <Keyword>Xbox360Proj</Keyword>
+    <ProjectName>RetroArch-360</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'" Label="Configuration">
@@ -562,7 +563,6 @@
       <Command Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">copy %(FullPath) $(OutDir)media\shaders\stock.cg</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">copy %(FullPath) $(OutDir)media\shaders\stock.cg</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">copy %(FullPath) $(OutDir)media\shaders\stock.cg</Command>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">true</ExcludedFromBuild>
@@ -650,4 +650,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/msvc-360/SSNES-360/SSNES-360.vcxproj.filters b/msvc-360/SSNES-360/SSNES-360.vcxproj.filters
index 9c434ed26d..a587f0c6e1 100644
--- a/msvc-360/SSNES-360/SSNES-360.vcxproj.filters
+++ b/msvc-360/SSNES-360/SSNES-360.vcxproj.filters
@@ -150,8 +150,6 @@
     <CustomBuild Include="..\..\360\media\shaders\stock.cg">
       <Filter>Source Files\media\shader</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\360\media\rarch.ttf" />
-    <CustomBuild Include="..\..\360\media\rarch_scene_skin.xui" />
     <CustomBuild Include="..\..\360\media\sd\rarch_filebrowser.xui">
       <Filter>Source Files\media\sd</Filter>
     </CustomBuild>
@@ -182,5 +180,11 @@
     <CustomBuild Include="..\..\360\media\sd\rarch_settings.xui">
       <Filter>Source Files\media\sd</Filter>
     </CustomBuild>
+    <CustomBuild Include="..\..\360\media\rarch.ttf">
+      <Filter>Source Files\media</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\360\media\rarch_scene_skin.xui">
+      <Filter>Source Files\media</Filter>
+    </CustomBuild>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/msvc-360/SSNES-Salamander/SSNES-Salamander.vcxproj b/msvc-360/SSNES-Salamander/SSNES-Salamander.vcxproj
index 51cd0c99da..b5492306cd 100644
--- a/msvc-360/SSNES-Salamander/SSNES-Salamander.vcxproj
+++ b/msvc-360/SSNES-Salamander/SSNES-Salamander.vcxproj
@@ -29,6 +29,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{29D5B973-F267-4039-84E7-8D34E9D00800}</ProjectGuid>
     <Keyword>Xbox360Proj</Keyword>
+    <ProjectName>RetroArch-Salamander</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'" Label="Configuration">