From ccaa3e6e93ed0b9b0ddb31bf884bc426a50950ec Mon Sep 17 00:00:00 2001
From: David Ludwig <dludwig@pobox.com>
Date: Wed, 23 Jan 2013 23:42:50 -0500
Subject: [PATCH] WinRT: separated Win32 and WinRT project files

---
 .../SDL/SDL_VS2012.vcxproj                    |   2 +-
 .../SDL/SDL_VS2012.vcxproj.filters            |   0
 .../SDL_VS2012.sln                            |   0
 .../tests/loopwave}/Assets/Logo.png           | Bin
 .../tests/loopwave}/Assets/SmallLogo.png      | Bin
 .../tests/loopwave}/Assets/SplashScreen.png   | Bin
 .../tests/loopwave}/Assets/StoreLogo.png      | Bin
 .../tests/loopwave}/Package.appxmanifest      |   0
 .../tests/loopwave/loopwave_VS2012.vcxproj    |  21 +++++++++---------
 .../loopwave/loopwave_VS2012_TemporaryKey.pfx | Bin
 .../tests/testthread}/Assets/Logo.png         | Bin
 .../tests/testthread}/Assets/SmallLogo.png    | Bin
 .../tests/testthread}/Assets/SplashScreen.png | Bin
 .../tests/testthread}/Assets/StoreLogo.png    | Bin
 .../tests/testthread}/Package.appxmanifest    |   0
 .../testthread/testthread_VS2012.vcxproj      |  15 +++++++------
 .../testthread_VS2012_TemporaryKey.pfx        | Bin
 17 files changed, 20 insertions(+), 18 deletions(-)
 rename VisualC/SDL/SDL_VS2012_WinRT.vcxproj => VisualC-WinRT/SDL/SDL_VS2012.vcxproj (98%)
 rename VisualC/SDL/SDL_VS2012_WinRT.vcxproj.filters => VisualC-WinRT/SDL/SDL_VS2012.vcxproj.filters (100%)
 rename VisualC/SDL_VS2012_WinRT.sln => VisualC-WinRT/SDL_VS2012.sln (100%)
 rename {VisualC/tests/loopwave/WinRT => VisualC-WinRT/tests/loopwave}/Assets/Logo.png (100%)
 rename {VisualC/tests/loopwave/WinRT => VisualC-WinRT/tests/loopwave}/Assets/SmallLogo.png (100%)
 rename {VisualC/tests/loopwave/WinRT => VisualC-WinRT/tests/loopwave}/Assets/SplashScreen.png (100%)
 rename {VisualC/tests/loopwave/WinRT => VisualC-WinRT/tests/loopwave}/Assets/StoreLogo.png (100%)
 rename {VisualC/tests/loopwave/WinRT => VisualC-WinRT/tests/loopwave}/Package.appxmanifest (100%)
 rename VisualC/tests/loopwave/WinRT/loopwave_VS2012_WinRT.vcxproj => VisualC-WinRT/tests/loopwave/loopwave_VS2012.vcxproj (91%)
 rename VisualC/tests/loopwave/WinRT/loopwave_VS2012_WinRT_TemporaryKey.pfx => VisualC-WinRT/tests/loopwave/loopwave_VS2012_TemporaryKey.pfx (100%)
 rename {VisualC/tests/testthread/WinRT => VisualC-WinRT/tests/testthread}/Assets/Logo.png (100%)
 rename {VisualC/tests/testthread/WinRT => VisualC-WinRT/tests/testthread}/Assets/SmallLogo.png (100%)
 rename {VisualC/tests/testthread/WinRT => VisualC-WinRT/tests/testthread}/Assets/SplashScreen.png (100%)
 rename {VisualC/tests/testthread/WinRT => VisualC-WinRT/tests/testthread}/Assets/StoreLogo.png (100%)
 rename {VisualC/tests/testthread/WinRT => VisualC-WinRT/tests/testthread}/Package.appxmanifest (100%)
 rename VisualC/tests/testthread/WinRT/testthread_VS2012_WinRT.vcxproj => VisualC-WinRT/tests/testthread/testthread_VS2012.vcxproj (92%)
 rename VisualC/tests/testthread/WinRT/testthread_VS2012_WinRT_TemporaryKey.pfx => VisualC-WinRT/tests/testthread/testthread_VS2012_TemporaryKey.pfx (100%)

diff --git a/VisualC/SDL/SDL_VS2012_WinRT.vcxproj b/VisualC-WinRT/SDL/SDL_VS2012.vcxproj
similarity index 98%
rename from VisualC/SDL/SDL_VS2012_WinRT.vcxproj
rename to VisualC-WinRT/SDL/SDL_VS2012.vcxproj
index 4fd72398a..ac0162d0a 100644
--- a/VisualC/SDL/SDL_VS2012_WinRT.vcxproj
+++ b/VisualC-WinRT/SDL/SDL_VS2012.vcxproj
@@ -310,7 +310,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{aeaea3a2-d4e6-45b1-8ec6-53d84287fc14}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <ProjectName>SDL_VS2012_WinRT</ProjectName>
+    <ProjectName>SDL</ProjectName>
     <RootNamespace>SDL_VS2012_WinRT</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
     <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
diff --git a/VisualC/SDL/SDL_VS2012_WinRT.vcxproj.filters b/VisualC-WinRT/SDL/SDL_VS2012.vcxproj.filters
similarity index 100%
rename from VisualC/SDL/SDL_VS2012_WinRT.vcxproj.filters
rename to VisualC-WinRT/SDL/SDL_VS2012.vcxproj.filters
diff --git a/VisualC/SDL_VS2012_WinRT.sln b/VisualC-WinRT/SDL_VS2012.sln
similarity index 100%
rename from VisualC/SDL_VS2012_WinRT.sln
rename to VisualC-WinRT/SDL_VS2012.sln
diff --git a/VisualC/tests/loopwave/WinRT/Assets/Logo.png b/VisualC-WinRT/tests/loopwave/Assets/Logo.png
similarity index 100%
rename from VisualC/tests/loopwave/WinRT/Assets/Logo.png
rename to VisualC-WinRT/tests/loopwave/Assets/Logo.png
diff --git a/VisualC/tests/loopwave/WinRT/Assets/SmallLogo.png b/VisualC-WinRT/tests/loopwave/Assets/SmallLogo.png
similarity index 100%
rename from VisualC/tests/loopwave/WinRT/Assets/SmallLogo.png
rename to VisualC-WinRT/tests/loopwave/Assets/SmallLogo.png
diff --git a/VisualC/tests/loopwave/WinRT/Assets/SplashScreen.png b/VisualC-WinRT/tests/loopwave/Assets/SplashScreen.png
similarity index 100%
rename from VisualC/tests/loopwave/WinRT/Assets/SplashScreen.png
rename to VisualC-WinRT/tests/loopwave/Assets/SplashScreen.png
diff --git a/VisualC/tests/loopwave/WinRT/Assets/StoreLogo.png b/VisualC-WinRT/tests/loopwave/Assets/StoreLogo.png
similarity index 100%
rename from VisualC/tests/loopwave/WinRT/Assets/StoreLogo.png
rename to VisualC-WinRT/tests/loopwave/Assets/StoreLogo.png
diff --git a/VisualC/tests/loopwave/WinRT/Package.appxmanifest b/VisualC-WinRT/tests/loopwave/Package.appxmanifest
similarity index 100%
rename from VisualC/tests/loopwave/WinRT/Package.appxmanifest
rename to VisualC-WinRT/tests/loopwave/Package.appxmanifest
diff --git a/VisualC/tests/loopwave/WinRT/loopwave_VS2012_WinRT.vcxproj b/VisualC-WinRT/tests/loopwave/loopwave_VS2012.vcxproj
similarity index 91%
rename from VisualC/tests/loopwave/WinRT/loopwave_VS2012_WinRT.vcxproj
rename to VisualC-WinRT/tests/loopwave/loopwave_VS2012.vcxproj
index bb27ceb52..4a87cbc85 100644
--- a/VisualC/tests/loopwave/WinRT/loopwave_VS2012_WinRT.vcxproj
+++ b/VisualC-WinRT/tests/loopwave/loopwave_VS2012.vcxproj
@@ -28,10 +28,11 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{03fcc293-9406-49c2-acf6-6e7d460c3239}</ProjectGuid>
-    <RootNamespace>loopwave_VS2012_WinRT</RootNamespace>
+    <RootNamespace>loopwave_VS2012</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
     <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
     <AppContainerApplication>true</AppContainerApplication>
+    <ProjectName>loopwave</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -90,7 +91,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <PackageCertificateKeyFile>loopwave_VS2012_WinRT_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateKeyFile>loopwave_VS2012_TemporaryKey.pfx</PackageCertificateKeyFile>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Link>
@@ -99,7 +100,7 @@
     <ClCompile>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);$(ProjectDir)..\..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);$(ProjectDir)..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4453</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -129,11 +130,11 @@
     <AppxManifest Include="Package.appxmanifest">
       <SubType>Designer</SubType>
     </AppxManifest>
-    <None Include="loopwave_VS2012_WinRT_TemporaryKey.pfx" />
+    <None Include="loopwave_VS2012_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\main\windowsrt\SDL_winrt_main.cpp" />
-    <ClCompile Include="..\..\..\..\test\loopwave.c">
+    <ClCompile Include="..\..\..\src\main\windowsrt\SDL_winrt_main.cpp" />
+    <ClCompile Include="..\..\..\test\loopwave.c">
       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
@@ -143,13 +144,13 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <Media Include="..\..\..\..\test\sample.wav" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\SDL\SDL_VS2012_WinRT.vcxproj">
+    <ProjectReference Include="..\..\SDL\SDL_VS2012.vcxproj">
       <Project>{aeaea3a2-d4e6-45b1-8ec6-53d84287fc14}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Media Include="..\..\..\test\sample.wav" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/VisualC/tests/loopwave/WinRT/loopwave_VS2012_WinRT_TemporaryKey.pfx b/VisualC-WinRT/tests/loopwave/loopwave_VS2012_TemporaryKey.pfx
similarity index 100%
rename from VisualC/tests/loopwave/WinRT/loopwave_VS2012_WinRT_TemporaryKey.pfx
rename to VisualC-WinRT/tests/loopwave/loopwave_VS2012_TemporaryKey.pfx
diff --git a/VisualC/tests/testthread/WinRT/Assets/Logo.png b/VisualC-WinRT/tests/testthread/Assets/Logo.png
similarity index 100%
rename from VisualC/tests/testthread/WinRT/Assets/Logo.png
rename to VisualC-WinRT/tests/testthread/Assets/Logo.png
diff --git a/VisualC/tests/testthread/WinRT/Assets/SmallLogo.png b/VisualC-WinRT/tests/testthread/Assets/SmallLogo.png
similarity index 100%
rename from VisualC/tests/testthread/WinRT/Assets/SmallLogo.png
rename to VisualC-WinRT/tests/testthread/Assets/SmallLogo.png
diff --git a/VisualC/tests/testthread/WinRT/Assets/SplashScreen.png b/VisualC-WinRT/tests/testthread/Assets/SplashScreen.png
similarity index 100%
rename from VisualC/tests/testthread/WinRT/Assets/SplashScreen.png
rename to VisualC-WinRT/tests/testthread/Assets/SplashScreen.png
diff --git a/VisualC/tests/testthread/WinRT/Assets/StoreLogo.png b/VisualC-WinRT/tests/testthread/Assets/StoreLogo.png
similarity index 100%
rename from VisualC/tests/testthread/WinRT/Assets/StoreLogo.png
rename to VisualC-WinRT/tests/testthread/Assets/StoreLogo.png
diff --git a/VisualC/tests/testthread/WinRT/Package.appxmanifest b/VisualC-WinRT/tests/testthread/Package.appxmanifest
similarity index 100%
rename from VisualC/tests/testthread/WinRT/Package.appxmanifest
rename to VisualC-WinRT/tests/testthread/Package.appxmanifest
diff --git a/VisualC/tests/testthread/WinRT/testthread_VS2012_WinRT.vcxproj b/VisualC-WinRT/tests/testthread/testthread_VS2012.vcxproj
similarity index 92%
rename from VisualC/tests/testthread/WinRT/testthread_VS2012_WinRT.vcxproj
rename to VisualC-WinRT/tests/testthread/testthread_VS2012.vcxproj
index 0f522e147..deedbc767 100644
--- a/VisualC/tests/testthread/WinRT/testthread_VS2012_WinRT.vcxproj
+++ b/VisualC-WinRT/tests/testthread/testthread_VS2012.vcxproj
@@ -28,10 +28,11 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{a8705bee-d01d-46a4-b2ab-feedfb5fdd11}</ProjectGuid>
-    <RootNamespace>testthread_VS2012_WinRT</RootNamespace>
+    <RootNamespace>testthread_VS2012</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
     <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
     <AppContainerApplication>true</AppContainerApplication>
+    <ProjectName>testthread</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -90,7 +91,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <PackageCertificateKeyFile>testthread_VS2012_WinRT_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateKeyFile>testthread_VS2012_TemporaryKey.pfx</PackageCertificateKeyFile>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Link>
@@ -99,7 +100,7 @@
     <ClCompile>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);$(ProjectDir)..\..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);$(ProjectDir)..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4453</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -135,10 +136,10 @@
     <AppxManifest Include="Package.appxmanifest">
       <SubType>Designer</SubType>
     </AppxManifest>
-    <None Include="testthread_VS2012_WinRT_TemporaryKey.pfx" />
+    <None Include="testthread_VS2012_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\main\windowsrt\SDL_winrt_main.cpp">
+    <ClCompile Include="..\..\..\src\main\windowsrt\SDL_winrt_main.cpp">
       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</CompileAsWinRT>
       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</CompileAsWinRT>
       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</CompileAsWinRT>
@@ -146,10 +147,10 @@
       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</CompileAsWinRT>
       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\test\testthread.c" />
+    <ClCompile Include="..\..\..\test\testthread.c" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\SDL\SDL_VS2012_WinRT.vcxproj">
+    <ProjectReference Include="..\..\SDL\SDL_VS2012.vcxproj">
       <Project>{aeaea3a2-d4e6-45b1-8ec6-53d84287fc14}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/VisualC/tests/testthread/WinRT/testthread_VS2012_WinRT_TemporaryKey.pfx b/VisualC-WinRT/tests/testthread/testthread_VS2012_TemporaryKey.pfx
similarity index 100%
rename from VisualC/tests/testthread/WinRT/testthread_VS2012_WinRT_TemporaryKey.pfx
rename to VisualC-WinRT/tests/testthread/testthread_VS2012_TemporaryKey.pfx