Fixed compiling Windows RT code on Visual Studio 2013
authorSam Lantinga <slouken@libsdl.org>
Wed, 12 Mar 2014 07:26:07 -0700
changeset 8609d59f0f12bf07
parent 8608 c5d603f7094e
child 8610 670e049dfc29
Fixed compiling Windows RT code on Visual Studio 2013
VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj
VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj.filters
src/core/winrt/SDL_winrtapp_xaml.cpp
src/joystick/winrt/SDL_xinputjoystick.c
src/render/direct3d11/SDL_render_d3d11.c
src/render/direct3d11/SDL_render_d3d11_winrthelpers.cpp
src/render/direct3d11/SDL_render_d3d11_winrthelpers_cpp.h
src/render/direct3d11/SDL_render_winrt.cpp
src/render/direct3d11/SDL_render_winrt.h
src/video/winrt/SDL_winrtevents.cpp
src/video/winrt/SDL_winrtmouse.cpp
src/video/winrt/SDL_winrtopengles.cpp
src/video/winrt/SDL_winrtpointerinput.cpp
     1.1 --- a/VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj	Tue Mar 11 12:40:31 2014 -0400
     1.2 +++ b/VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj	Wed Mar 12 07:26:07 2014 -0700
     1.3 @@ -97,16 +97,10 @@
     1.4      <ClCompile Include="..\..\src\joystick\winrt\SDL_xinputjoystick.c" />
     1.5      <ClCompile Include="..\..\src\loadso\windows\SDL_sysloadso.c" />
     1.6      <ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11.c" />
     1.7 -    <ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11_winrthelpers.cpp">
     1.8 -      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</CompileAsWinRT>
     1.9 -      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</CompileAsWinRT>
    1.10 -      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</CompileAsWinRT>
    1.11 -      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</CompileAsWinRT>
    1.12 -      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</CompileAsWinRT>
    1.13 -      <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</CompileAsWinRT>
    1.14 -    </ClCompile>
    1.15 +    <ClCompile Include="..\..\src\render\direct3d11\SDL_render_winrt.cpp" />
    1.16      <ClCompile Include="..\..\src\render\opengles2\SDL_render_gles2.c" />
    1.17      <ClCompile Include="..\..\src\render\opengles2\SDL_shaders_gles2.c" />
    1.18 +    <ClCompile Include="..\..\src\render\SDL_d3dmath.c" />
    1.19      <ClCompile Include="..\..\src\render\SDL_render.c" />
    1.20      <ClCompile Include="..\..\src\render\SDL_yuv_mmx.c" />
    1.21      <ClCompile Include="..\..\src\render\SDL_yuv_sw.c" />
    1.22 @@ -285,10 +279,11 @@
    1.23      <ClInclude Include="..\..\src\joystick\SDL_gamecontrollerdb.h" />
    1.24      <ClInclude Include="..\..\src\joystick\SDL_joystick_c.h" />
    1.25      <ClInclude Include="..\..\src\joystick\SDL_sysjoystick.h" />
    1.26 -    <ClInclude Include="..\..\src\render\direct3d11\SDL_render_d3d11_winrthelpers_cpp.h" />
    1.27 +    <ClInclude Include="..\..\src\render\direct3d11\SDL_render_winrt.h" />
    1.28      <ClInclude Include="..\..\src\render\mmx.h" />
    1.29      <ClInclude Include="..\..\src\render\opengles2\SDL_gles2funcs.h" />
    1.30      <ClInclude Include="..\..\src\render\opengles2\SDL_shaders_gles2.h" />
    1.31 +    <ClInclude Include="..\..\src\render\SDL_d3dmath.h" />
    1.32      <ClInclude Include="..\..\src\render\SDL_sysrender.h" />
    1.33      <ClInclude Include="..\..\src\render\SDL_yuv_sw_c.h" />
    1.34      <ClInclude Include="..\..\src\render\software\SDL_blendfillrect.h" />
     2.1 --- a/VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj.filters	Tue Mar 11 12:40:31 2014 -0400
     2.2 +++ b/VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj.filters	Wed Mar 12 07:26:07 2014 -0700
     2.3 @@ -280,9 +280,8 @@
     2.4      <ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11.c">
     2.5        <Filter>Source Files</Filter>
     2.6      </ClCompile>
     2.7 -    <ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11_winrthelpers.cpp">
     2.8 -      <Filter>Source Files</Filter>
     2.9 -    </ClCompile>
    2.10 +    <ClCompile Include="..\..\src\render\direct3d11\SDL_render_winrt.cpp" />
    2.11 +    <ClCompile Include="..\..\src\render\SDL_d3dmath.c" />
    2.12    </ItemGroup>
    2.13    <ItemGroup>
    2.14      <ClInclude Include="..\..\include\begin_code.h">
    2.15 @@ -639,9 +638,8 @@
    2.16      <ClInclude Include="..\..\src\SDL_internal.h">
    2.17        <Filter>Source Files</Filter>
    2.18      </ClInclude>
    2.19 -    <ClInclude Include="..\..\src\render\direct3d11\SDL_render_d3d11_winrthelpers_cpp.h">
    2.20 -      <Filter>Source Files</Filter>
    2.21 -    </ClInclude>
    2.22 +    <ClInclude Include="..\..\src\render\direct3d11\SDL_render_winrt.h" />
    2.23 +    <ClInclude Include="..\..\src\render\SDL_d3dmath.h" />
    2.24    </ItemGroup>
    2.25    <ItemGroup>
    2.26      <Filter Include="Header Files">
     3.1 --- a/src/core/winrt/SDL_winrtapp_xaml.cpp	Tue Mar 11 12:40:31 2014 -0400
     3.2 +++ b/src/core/winrt/SDL_winrtapp_xaml.cpp	Wed Mar 12 07:26:07 2014 -0700
     3.3 @@ -42,6 +42,7 @@
     3.4  SDL_bool WINRT_XAMLWasEnabled = SDL_FALSE;
     3.5  
     3.6  #if WINAPI_FAMILY == WINAPI_FAMILY_APP
     3.7 +extern "C"
     3.8  ISwapChainBackgroundPanelNative * WINRT_GlobalSwapChainBackgroundPanelNative = NULL;
     3.9  static Windows::Foundation::EventRegistrationToken	WINRT_XAMLAppEventToken;
    3.10  #endif
     4.1 --- a/src/joystick/winrt/SDL_xinputjoystick.c	Tue Mar 11 12:40:31 2014 -0400
     4.2 +++ b/src/joystick/winrt/SDL_xinputjoystick.c	Wed Mar 12 07:26:07 2014 -0700
     4.3 @@ -18,7 +18,7 @@
     4.4       misrepresented as being the original software.
     4.5    3. This notice may not be removed or altered from any source distribution.
     4.6  */
     4.7 -#include "SDL_config.h"
     4.8 +#include "../../SDL_internal.h"
     4.9  
    4.10  #if SDL_JOYSTICK_XINPUT
    4.11  
     5.1 --- a/src/render/direct3d11/SDL_render_d3d11.c	Tue Mar 11 12:40:31 2014 -0400
     5.2 +++ b/src/render/direct3d11/SDL_render_d3d11.c	Wed Mar 12 07:26:07 2014 -0700
     5.3 @@ -35,7 +35,7 @@
     5.4  
     5.5  #ifdef __WINRT__
     5.6  
     5.7 -#include "SDL_render_d3d11_winrthelpers_cpp.h"
     5.8 +#include "SDL_render_winrt.h"
     5.9  
    5.10  #if WINAPI_FAMILY == WINAPI_FAMILY_APP
    5.11  #include <windows.ui.xaml.media.dxinterop.h>
     6.1 --- a/src/render/direct3d11/SDL_render_d3d11_winrthelpers.cpp	Tue Mar 11 12:40:31 2014 -0400
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,109 +0,0 @@
     6.4 -/*
     6.5 -  Simple DirectMedia Layer
     6.6 -  Copyright (C) 1997-2012 Sam Lantinga <slouken@libsdl.org>
     6.7 -
     6.8 -  This software is provided 'as-is', without any express or implied
     6.9 -  warranty.  In no event will the authors be held liable for any damages
    6.10 -  arising from the use of this software.
    6.11 -
    6.12 -  Permission is granted to anyone to use this software for any purpose,
    6.13 -  including commercial applications, and to alter it and redistribute it
    6.14 -  freely, subject to the following restrictions:
    6.15 -
    6.16 -  1. The origin of this software must not be misrepresented; you must not
    6.17 -     claim that you wrote the original software. If you use this software
    6.18 -     in a product, an acknowledgment in the product documentation would be
    6.19 -     appreciated but is not required.
    6.20 -  2. Altered source versions must be plainly marked as such, and must not be
    6.21 -     misrepresented as being the original software.
    6.22 -  3. This notice may not be removed or altered from any source distribution.
    6.23 -*/
    6.24 -#include "../../SDL_internal.h"
    6.25 -
    6.26 -#if SDL_VIDEO_RENDER_D3D11 && !SDL_RENDER_DISABLED
    6.27 -
    6.28 -#include "SDL_syswm.h"
    6.29 -extern "C" {
    6.30 -#include "../SDL_sysrender.h"
    6.31 -}
    6.32 -
    6.33 -#include <windows.ui.core.h>
    6.34 -#include <windows.foundation.h>
    6.35 -
    6.36 -#if WINAPI_FAMILY == WINAPI_FAMILY_APP
    6.37 -#include <windows.ui.xaml.media.dxinterop.h>
    6.38 -#endif
    6.39 -
    6.40 -using namespace Windows::UI::Core;
    6.41 -using namespace Windows::Graphics::Display;
    6.42 -
    6.43 -
    6.44 -extern "C" void *
    6.45 -D3D11_GetCoreWindowFromSDLRenderer(SDL_Renderer * renderer)
    6.46 -{
    6.47 -    SDL_Window * sdlWindow = renderer->window;
    6.48 -    if ( ! renderer->window ) {
    6.49 -        return NULL;
    6.50 -    }
    6.51 -
    6.52 -    SDL_SysWMinfo sdlWindowInfo;
    6.53 -    SDL_VERSION(&sdlWindowInfo.version);
    6.54 -    if ( ! SDL_GetWindowWMInfo(sdlWindow, &sdlWindowInfo) ) {
    6.55 -        return NULL;
    6.56 -    }
    6.57 -
    6.58 -    if (sdlWindowInfo.subsystem != SDL_SYSWM_WINRT) {
    6.59 -        return NULL;
    6.60 -    }
    6.61 -
    6.62 -    if (!sdlWindowInfo.info.winrt.window) {
    6.63 -        return NULL;
    6.64 -    }
    6.65 -
    6.66 -    ABI::Windows::UI::Core::ICoreWindow *coreWindow = NULL;
    6.67 -    if (FAILED(sdlWindowInfo.info.winrt.window->QueryInterface(&coreWindow))) {
    6.68 -        return NULL;
    6.69 -    }
    6.70 -
    6.71 -    IUnknown *coreWindowAsIUnknown = NULL;
    6.72 -    coreWindow->QueryInterface(&coreWindowAsIUnknown);
    6.73 -    coreWindow->Release();
    6.74 -
    6.75 -    return coreWindowAsIUnknown;
    6.76 -}
    6.77 -
    6.78 -extern "C" DXGI_MODE_ROTATION
    6.79 -D3D11_GetCurrentRotation()
    6.80 -{
    6.81 -    switch (DisplayProperties::CurrentOrientation) {
    6.82 -#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
    6.83 -        /* Windows Phone rotations */
    6.84 -        case DisplayOrientations::Landscape:
    6.85 -            return DXGI_MODE_ROTATION_ROTATE90;
    6.86 -        case DisplayOrientations::Portrait:
    6.87 -            return DXGI_MODE_ROTATION_IDENTITY;
    6.88 -        case DisplayOrientations::LandscapeFlipped:
    6.89 -            return DXGI_MODE_ROTATION_ROTATE270;
    6.90 -        case DisplayOrientations::PortraitFlipped:
    6.91 -            return DXGI_MODE_ROTATION_ROTATE180;
    6.92 -#else
    6.93 -        /* Non-Windows-Phone rotations (ex: Windows 8, Windows RT) */
    6.94 -        case DisplayOrientations::Landscape:
    6.95 -            return DXGI_MODE_ROTATION_IDENTITY;
    6.96 -        case DisplayOrientations::Portrait:
    6.97 -            return DXGI_MODE_ROTATION_ROTATE270;
    6.98 -        case DisplayOrientations::LandscapeFlipped:
    6.99 -            return DXGI_MODE_ROTATION_ROTATE180;
   6.100 -        case DisplayOrientations::PortraitFlipped:
   6.101 -            return DXGI_MODE_ROTATION_ROTATE90;
   6.102 -#endif /* WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP */
   6.103 -
   6.104 -    default:
   6.105 -        return DXGI_MODE_ROTATION_UNSPECIFIED;
   6.106 -    }
   6.107 -}
   6.108 -
   6.109 -
   6.110 -#endif /* SDL_VIDEO_RENDER_D3D11 && !SDL_RENDER_DISABLED */
   6.111 -
   6.112 -/* vi: set ts=4 sw=4 expandtab: */
     7.1 --- a/src/render/direct3d11/SDL_render_d3d11_winrthelpers_cpp.h	Tue Mar 11 12:40:31 2014 -0400
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,40 +0,0 @@
     7.4 -/*
     7.5 -  Simple DirectMedia Layer
     7.6 -  Copyright (C) 1997-2012 Sam Lantinga <slouken@libsdl.org>
     7.7 -
     7.8 -  This software is provided 'as-is', without any express or implied
     7.9 -  warranty.  In no event will the authors be held liable for any damages
    7.10 -  arising from the use of this software.
    7.11 -
    7.12 -  Permission is granted to anyone to use this software for any purpose,
    7.13 -  including commercial applications, and to alter it and redistribute it
    7.14 -  freely, subject to the following restrictions:
    7.15 -
    7.16 -  1. The origin of this software must not be misrepresented; you must not
    7.17 -     claim that you wrote the original software. If you use this software
    7.18 -     in a product, an acknowledgment in the product documentation would be
    7.19 -     appreciated but is not required.
    7.20 -  2. Altered source versions must be plainly marked as such, and must not be
    7.21 -     misrepresented as being the original software.
    7.22 -  3. This notice may not be removed or altered from any source distribution.
    7.23 -*/
    7.24 -#include "../../SDL_internal.h"
    7.25 -
    7.26 -#if SDL_VIDEO_RENDER_D3D11 && !SDL_RENDER_DISABLED
    7.27 -
    7.28 -#include "SDL_render.h"
    7.29 -
    7.30 -#ifdef __cplusplus
    7.31 -extern "C" {
    7.32 -#endif
    7.33 -
    7.34 -void * D3D11_GetCoreWindowFromSDLRenderer(SDL_Renderer * renderer);
    7.35 -DXGI_MODE_ROTATION D3D11_GetCurrentRotation();
    7.36 -
    7.37 -#ifdef __cplusplus
    7.38 -}
    7.39 -#endif
    7.40 -
    7.41 -#endif /* SDL_VIDEO_RENDER_D3D11 && !SDL_RENDER_DISABLED */
    7.42 -
    7.43 -/* vi: set ts=4 sw=4 expandtab: */
     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/src/render/direct3d11/SDL_render_winrt.cpp	Wed Mar 12 07:26:07 2014 -0700
     8.3 @@ -0,0 +1,112 @@
     8.4 +/*
     8.5 +  Simple DirectMedia Layer
     8.6 +  Copyright (C) 1997-2012 Sam Lantinga <slouken@libsdl.org>
     8.7 +
     8.8 +  This software is provided 'as-is', without any express or implied
     8.9 +  warranty.  In no event will the authors be held liable for any damages
    8.10 +  arising from the use of this software.
    8.11 +
    8.12 +  Permission is granted to anyone to use this software for any purpose,
    8.13 +  including commercial applications, and to alter it and redistribute it
    8.14 +  freely, subject to the following restrictions:
    8.15 +
    8.16 +  1. The origin of this software must not be misrepresented; you must not
    8.17 +     claim that you wrote the original software. If you use this software
    8.18 +     in a product, an acknowledgment in the product documentation would be
    8.19 +     appreciated but is not required.
    8.20 +  2. Altered source versions must be plainly marked as such, and must not be
    8.21 +     misrepresented as being the original software.
    8.22 +  3. This notice may not be removed or altered from any source distribution.
    8.23 +*/
    8.24 +#include "../../SDL_internal.h"
    8.25 +
    8.26 +#if SDL_VIDEO_RENDER_D3D11 && !SDL_RENDER_DISABLED
    8.27 +
    8.28 +#include "SDL_syswm.h"
    8.29 +extern "C" {
    8.30 +#include "../SDL_sysrender.h"
    8.31 +}
    8.32 +
    8.33 +#include <windows.ui.core.h>
    8.34 +#include <windows.graphics.display.h>
    8.35 +
    8.36 +#if WINAPI_FAMILY == WINAPI_FAMILY_APP
    8.37 +#include <windows.ui.xaml.media.dxinterop.h>
    8.38 +#endif
    8.39 +
    8.40 +#include "SDL_render_winrt.h"
    8.41 +
    8.42 +using namespace ABI;
    8.43 +using namespace Windows::UI::Core;
    8.44 +using namespace Windows::Graphics::Display;
    8.45 +
    8.46 +
    8.47 +extern "C" void *
    8.48 +D3D11_GetCoreWindowFromSDLRenderer(SDL_Renderer * renderer)
    8.49 +{
    8.50 +    SDL_Window * sdlWindow = renderer->window;
    8.51 +    if ( ! renderer->window ) {
    8.52 +        return NULL;
    8.53 +    }
    8.54 +
    8.55 +    SDL_SysWMinfo sdlWindowInfo;
    8.56 +    SDL_VERSION(&sdlWindowInfo.version);
    8.57 +    if ( ! SDL_GetWindowWMInfo(sdlWindow, &sdlWindowInfo) ) {
    8.58 +        return NULL;
    8.59 +    }
    8.60 +
    8.61 +    if (sdlWindowInfo.subsystem != SDL_SYSWM_WINRT) {
    8.62 +        return NULL;
    8.63 +    }
    8.64 +
    8.65 +    if (!sdlWindowInfo.info.winrt.window) {
    8.66 +        return NULL;
    8.67 +    }
    8.68 +
    8.69 +    ABI::Windows::UI::Core::ICoreWindow *coreWindow = NULL;
    8.70 +    if (FAILED(sdlWindowInfo.info.winrt.window->QueryInterface(&coreWindow))) {
    8.71 +        return NULL;
    8.72 +    }
    8.73 +
    8.74 +    IUnknown *coreWindowAsIUnknown = NULL;
    8.75 +    coreWindow->QueryInterface(&coreWindowAsIUnknown);
    8.76 +    coreWindow->Release();
    8.77 +
    8.78 +    return coreWindowAsIUnknown;
    8.79 +}
    8.80 +
    8.81 +extern "C" DXGI_MODE_ROTATION
    8.82 +D3D11_GetCurrentRotation()
    8.83 +{
    8.84 +#if 0 /* FIXME: This doesn't compile on Visual Studio 2013 */
    8.85 +    switch (DisplayProperties::CurrentOrientation) {
    8.86 +#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
    8.87 +    /* Windows Phone rotations */
    8.88 +    case DisplayOrientations::Landscape:
    8.89 +        return DXGI_MODE_ROTATION_ROTATE90;
    8.90 +    case DisplayOrientations::Portrait:
    8.91 +        return DXGI_MODE_ROTATION_IDENTITY;
    8.92 +    case DisplayOrientations::LandscapeFlipped:
    8.93 +        return DXGI_MODE_ROTATION_ROTATE270;
    8.94 +    case DisplayOrientations::PortraitFlipped:
    8.95 +        return DXGI_MODE_ROTATION_ROTATE180;
    8.96 +#else
    8.97 +    /* Non-Windows-Phone rotations (ex: Windows 8, Windows RT) */
    8.98 +    case DisplayOrientations::Landscape:
    8.99 +        return DXGI_MODE_ROTATION_IDENTITY;
   8.100 +    case DisplayOrientations::Portrait:
   8.101 +        return DXGI_MODE_ROTATION_ROTATE270;
   8.102 +    case DisplayOrientations::LandscapeFlipped:
   8.103 +        return DXGI_MODE_ROTATION_ROTATE180;
   8.104 +    case DisplayOrientations::PortraitFlipped:
   8.105 +        return DXGI_MODE_ROTATION_ROTATE90;
   8.106 +#endif /* WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP */
   8.107 +    }
   8.108 +#endif
   8.109 +    return DXGI_MODE_ROTATION_IDENTITY;
   8.110 +}
   8.111 +
   8.112 +
   8.113 +#endif /* SDL_VIDEO_RENDER_D3D11 && !SDL_RENDER_DISABLED */
   8.114 +
   8.115 +/* vi: set ts=4 sw=4 expandtab: */
     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/src/render/direct3d11/SDL_render_winrt.h	Wed Mar 12 07:26:07 2014 -0700
     9.3 @@ -0,0 +1,40 @@
     9.4 +/*
     9.5 +  Simple DirectMedia Layer
     9.6 +  Copyright (C) 1997-2012 Sam Lantinga <slouken@libsdl.org>
     9.7 +
     9.8 +  This software is provided 'as-is', without any express or implied
     9.9 +  warranty.  In no event will the authors be held liable for any damages
    9.10 +  arising from the use of this software.
    9.11 +
    9.12 +  Permission is granted to anyone to use this software for any purpose,
    9.13 +  including commercial applications, and to alter it and redistribute it
    9.14 +  freely, subject to the following restrictions:
    9.15 +
    9.16 +  1. The origin of this software must not be misrepresented; you must not
    9.17 +     claim that you wrote the original software. If you use this software
    9.18 +     in a product, an acknowledgment in the product documentation would be
    9.19 +     appreciated but is not required.
    9.20 +  2. Altered source versions must be plainly marked as such, and must not be
    9.21 +     misrepresented as being the original software.
    9.22 +  3. This notice may not be removed or altered from any source distribution.
    9.23 +*/
    9.24 +#include "../../SDL_internal.h"
    9.25 +
    9.26 +#if SDL_VIDEO_RENDER_D3D11 && !SDL_RENDER_DISABLED
    9.27 +
    9.28 +#include "SDL_render.h"
    9.29 +
    9.30 +#ifdef __cplusplus
    9.31 +extern "C" {
    9.32 +#endif
    9.33 +
    9.34 +void * D3D11_GetCoreWindowFromSDLRenderer(SDL_Renderer * renderer);
    9.35 +DXGI_MODE_ROTATION D3D11_GetCurrentRotation();
    9.36 +
    9.37 +#ifdef __cplusplus
    9.38 +}
    9.39 +#endif
    9.40 +
    9.41 +#endif /* SDL_VIDEO_RENDER_D3D11 && !SDL_RENDER_DISABLED */
    9.42 +
    9.43 +/* vi: set ts=4 sw=4 expandtab: */
    10.1 --- a/src/video/winrt/SDL_winrtevents.cpp	Tue Mar 11 12:40:31 2014 -0400
    10.2 +++ b/src/video/winrt/SDL_winrtevents.cpp	Wed Mar 12 07:26:07 2014 -0700
    10.3 @@ -18,7 +18,7 @@
    10.4       misrepresented as being the original software.
    10.5    3. This notice may not be removed or altered from any source distribution.
    10.6  */
    10.7 -#include "SDL_config.h"
    10.8 +#include "../../SDL_internal.h"
    10.9  
   10.10  #if SDL_VIDEO_DRIVER_WINRT
   10.11  
    11.1 --- a/src/video/winrt/SDL_winrtmouse.cpp	Tue Mar 11 12:40:31 2014 -0400
    11.2 +++ b/src/video/winrt/SDL_winrtmouse.cpp	Wed Mar 12 07:26:07 2014 -0700
    11.3 @@ -18,7 +18,6 @@
    11.4       misrepresented as being the original software.
    11.5    3. This notice may not be removed or altered from any source distribution.
    11.6  */
    11.7 -
    11.8  #include "../../SDL_internal.h"
    11.9  
   11.10  #if SDL_VIDEO_DRIVER_WINRT
    12.1 --- a/src/video/winrt/SDL_winrtopengles.cpp	Tue Mar 11 12:40:31 2014 -0400
    12.2 +++ b/src/video/winrt/SDL_winrtopengles.cpp	Wed Mar 12 07:26:07 2014 -0700
    12.3 @@ -18,7 +18,7 @@
    12.4       misrepresented as being the original software.
    12.5    3. This notice may not be removed or altered from any source distribution.
    12.6  */
    12.7 -#include "SDL_config.h"
    12.8 +#include "../../SDL_internal.h"
    12.9  
   12.10  // TODO: WinRT, make this file compile via C code
   12.11  
    13.1 --- a/src/video/winrt/SDL_winrtpointerinput.cpp	Tue Mar 11 12:40:31 2014 -0400
    13.2 +++ b/src/video/winrt/SDL_winrtpointerinput.cpp	Wed Mar 12 07:26:07 2014 -0700
    13.3 @@ -18,7 +18,7 @@
    13.4       misrepresented as being the original software.
    13.5    3. This notice may not be removed or altered from any source distribution.
    13.6  */
    13.7 -#include "SDL_config.h"
    13.8 +#include "../../SDL_internal.h"
    13.9  
   13.10  #if SDL_VIDEO_DRIVER_WINRT
   13.11