WinRT: cleaned up headers in src\video\windowsrt\

libsdl-org · Feb 24, 2013 · 4cb3976 · 4cb3976
1 parent 5e2fd9d
commit 4cb3976
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 61 deletions.
diff --git a/VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj b/VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj
@@ -244,8 +244,6 @@
     <ClInclude Include="..\..\src\video\SDL_RLEaccel_c.h" />
     <ClInclude Include="..\..\src\video\SDL_shape_internals.h" />
     <ClInclude Include="..\..\src\video\SDL_sysvideo.h" />
-    <ClInclude Include="..\..\src\video\windowsrt\DirectXHelper.h" />
-    <ClInclude Include="..\..\src\video\windowsrt\SDLmain_WinRT_common.h" />
     <ClInclude Include="..\..\src\video\windowsrt\SDL_WinRTApp.h" />
     <ClInclude Include="..\..\src\video\windowsrt\SDL_winrtevents_c.h" />
     <ClInclude Include="..\..\src\video\windowsrt\SDL_winrtmouse.h" />

diff --git a/VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj.filters b/VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj.filters
@@ -321,12 +321,6 @@
     <ClInclude Include="..\..\src\video\SDL_sysvideo.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\video\windowsrt\DirectXHelper.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\video\windowsrt\SDLmain_WinRT_common.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\video\windowsrt\SDL_WinRTApp.h">
       <Filter>Source Files</Filter>
     </ClInclude>

diff --git a/VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj b/VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj
@@ -273,8 +273,6 @@
     <ClInclude Include="..\..\src\video\SDL_RLEaccel_c.h" />
     <ClInclude Include="..\..\src\video\SDL_shape_internals.h" />
     <ClInclude Include="..\..\src\video\SDL_sysvideo.h" />
-    <ClInclude Include="..\..\src\video\windowsrt\DirectXHelper.h" />
-    <ClInclude Include="..\..\src\video\windowsrt\SDLmain_WinRT_common.h" />
     <ClInclude Include="..\..\src\video\windowsrt\SDL_WinRTApp.h" />
     <ClInclude Include="..\..\src\video\windowsrt\SDL_winrtevents_c.h" />
     <ClInclude Include="..\..\src\video\windowsrt\SDL_winrtmouse.h" />

diff --git a/VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj.filters b/VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj.filters
@@ -578,12 +578,6 @@
     <ClInclude Include="..\..\src\audio\xaudio2\SDL_xaudio2_winrthelpers.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\video\windowsrt\SDLmain_WinRT_common.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\video\windowsrt\DirectXHelper.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\events\blank_cursor.h">
       <Filter>Source Files</Filter>
     </ClInclude>

diff --git a/src/video/windowsrt/DirectXHelper.h b/src/video/windowsrt/DirectXHelper.h
diff --git a/src/video/windowsrt/SDL_WinRTApp.cpp b/src/video/windowsrt/SDL_WinRTApp.cpp
@@ -1,26 +1,28 @@
-#include "SDLmain_WinRT_common.h"
-#include "SDL_WinRTApp.h"
+
+#include <string>
+#include <unordered_map>
+#include <sstream>
+
 #include "ppltasks.h"
 
 extern "C" {
 #include "SDL_assert.h"
+#include "SDL_events.h"
+#include "SDL_hints.h"
+#include "SDL_log.h"
 #include "SDL_stdinc.h"
+#include "SDL_render.h"
 #include "../SDL_sysvideo.h"
+#include "../../SDL_hints_c.h"
+#include "../../events/scancodes_windows.h"
 #include "../../events/SDL_mouse_c.h"
 #include "../../events/SDL_keyboard_c.h"
 #include "../../events/SDL_windowevents_c.h"
-#include "../../events/scancodes_windows.h"
-#include "SDL_events.h"
-#include "SDL_log.h"
-#include "SDL_render.h"
 #include "../../render/SDL_sysrender.h"
-#include "SDL_hints.h"
-#include "../../SDL_hints_c.h"
 }
 
-#include <string>
-#include <unordered_map>
-#include <sstream>
+#include "SDL_winrtvideo.h"
+#include "SDL_WinRTApp.h"
 
 using namespace concurrency;
 using namespace std;

diff --git a/src/video/windowsrt/SDL_WinRTApp.h b/src/video/windowsrt/SDL_WinRTApp.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include "SDLmain_WinRT_common.h"
-#include "SDL_winrtvideo.h"
+struct SDL_WindowData;
 
 ref class SDL_WinRTApp sealed : public Windows::ApplicationModel::Core::IFrameworkView
 {

diff --git a/src/video/windowsrt/SDLmain_WinRT_common.h b/src/video/windowsrt/SDLmain_WinRT_common.h