From f3bd9175a958c8e3ff8dc9e5626ee2b7e5a15766 Mon Sep 17 00:00:00 2001
From: David Ludwig <dludwig@pobox.com>
Date: Wed, 4 Sep 2013 19:55:45 -0400
Subject: [PATCH] WinRT: more renaming of "windowsrt" to "winrt"

---
 VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj         | 2 +-
 VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj.filters | 6 +++---
 VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj               | 2 +-
 VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj.filters       | 6 +++---
 include/SDL_config.h                                     | 2 +-
 include/{SDL_config_windowsrt.h => SDL_config_winrt.h}   | 0
 include/SDL_main.h                                       | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)
 rename include/{SDL_config_windowsrt.h => SDL_config_winrt.h} (100%)

diff --git a/VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj b/VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj
index 92d85333d30a7..59bb72d13a626 100644
--- a/VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj
+++ b/VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj
@@ -150,7 +150,7 @@
     <ClInclude Include="..\..\include\SDL_clipboard.h" />
     <ClInclude Include="..\..\include\SDL_config.h" />
     <ClInclude Include="..\..\include\SDL_config_minimal.h" />
-    <ClInclude Include="..\..\include\SDL_config_windowsrt.h" />
+    <ClInclude Include="..\..\include\SDL_config_winrt.h" />
     <ClInclude Include="..\..\include\SDL_copying.h" />
     <ClInclude Include="..\..\include\SDL_cpuinfo.h" />
     <ClInclude Include="..\..\include\SDL_endian.h" />
diff --git a/VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj.filters b/VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj.filters
index d021737620b66..2b5524e9ccffc 100644
--- a/VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj.filters
+++ b/VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj.filters
@@ -42,9 +42,6 @@
     <ClInclude Include="..\..\include\SDL_config_minimal.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_config_windowsrt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\SDL_copying.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -339,6 +336,9 @@
     <ClInclude Include="..\..\src\video\winrt\SDL_winrtmouse_c.h">
       <Filter>Source Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\SDL_config_winrt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\atomic\SDL_atomic.c">
diff --git a/VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj b/VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj
index 73639f5434ddd..2fe031891a3b6 100644
--- a/VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj
+++ b/VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj
@@ -204,7 +204,7 @@
     <ClInclude Include="..\..\include\SDL_clipboard.h" />
     <ClInclude Include="..\..\include\SDL_config.h" />
     <ClInclude Include="..\..\include\SDL_config_minimal.h" />
-    <ClInclude Include="..\..\include\SDL_config_windowsrt.h" />
+    <ClInclude Include="..\..\include\SDL_config_winrt.h" />
     <ClInclude Include="..\..\include\SDL_copying.h" />
     <ClInclude Include="..\..\include\SDL_cpuinfo.h" />
     <ClInclude Include="..\..\include\SDL_endian.h" />
diff --git a/VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj.filters b/VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj.filters
index 6a9166aa5a310..4c22c3f8182d1 100644
--- a/VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj.filters
+++ b/VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj.filters
@@ -410,9 +410,6 @@
     <ClInclude Include="..\..\include\SDL_config_minimal.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_config_windowsrt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\SDL_copying.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -608,6 +605,9 @@
     <ClInclude Include="..\..\src\video\winrt\SDL_winrtmouse_c.h">
       <Filter>Source Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\SDL_config_winrt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Header Files">
diff --git a/include/SDL_config.h b/include/SDL_config.h
index 9022af81e182a..ae69e37bda85f 100644
--- a/include/SDL_config.h
+++ b/include/SDL_config.h
@@ -32,7 +32,7 @@
 #if defined(__WIN32__)
 #include "SDL_config_windows.h"
 #elif defined(__WINRT__)
-#include "SDL_config_windowsrt.h"
+#include "SDL_config_winrt.h"
 #elif defined(__MACOSX__)
 #include "SDL_config_macosx.h"
 #elif defined(__IPHONEOS__)
diff --git a/include/SDL_config_windowsrt.h b/include/SDL_config_winrt.h
similarity index 100%
rename from include/SDL_config_windowsrt.h
rename to include/SDL_config_winrt.h
diff --git a/include/SDL_main.h b/include/SDL_main.h
index 946ead990b8fe..876ee341ad857 100644
--- a/include/SDL_main.h
+++ b/include/SDL_main.h
@@ -44,7 +44,7 @@
    creating an instance of IFrameworkView in the process.
 
    Please note that #include'ing SDL_main.h is not enough to get a main()
-   function working.  The file, src/main/windowsrt/SDL_WinRT_main.cpp, or a copy
+   function working.  The file, src/main/winrt/SDL_WinRT_main.cpp, or a copy
    of it, must be compiled into the app itself.
 */
 #define SDL_MAIN_NEEDED