pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
David Ludwig 2013-02-24 10:02:57 -05:00
parent 5520a12a33
commit a53fe847a1
8 changed files with 14 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

2
VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj
View file

@ -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" />

6
VisualC-WinPhone/SDL/SDL_VS2012-WinPhone.vcxproj.filters
View file

@ -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>

2
VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj
View file

@ -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" />

6
VisualC-WinRT/SDL/SDL_VS2012-WinRT.vcxproj.filters
View file

@ -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>

17
src/video/windowsrt/DirectXHelper.h
View file

@ -1,17 +0,0 @@
#pragma once
#include <wrl/client.h>
#include <ppl.h>
#include <ppltasks.h>
namespace DX
{
inline void ThrowIfFailed(HRESULT hr)
{
if (FAILED(hr))
{
// Set a breakpoint on this line to catch Win32 API errors.
throw Platform::Exception::CreateException(hr);
}
}
}

24
src/video/windowsrt/SDL_WinRTApp.cpp
View file

@ -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;

3
src/video/windowsrt/SDL_WinRTApp.h
View file

@ -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
{

15
src/video/windowsrt/SDLmain_WinRT_common.h
View file

@ -1,15 +0,0 @@
#pragma once
#include <wrl/client.h>
#include <d3d11_1.h>
#include <DirectXMath.h>
#include <memory>
#include <agile.h>
#include <vector>
extern "C" {
#include "../SDL_sysvideo.h"
}
#include "SDL_winrtvideo.h"