WinRT: more renaming of "windowsrt" to "winrt"

libsdl-org · Sep 4, 2013 · f3bd917 · f3bd917
1 parent 8fc04cc
commit f3bd917
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 → include/SDL_config_winrt.h b/include/SDL_config_windowsrt.h → include/SDL_config_winrt.h
diff --git 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