build fixes for most WinRT-related files
authorDavid Ludwig <dludwig@pobox.com>
Mon, 10 Mar 2014 21:21:35 -0400
changeset 8600092802455aed
parent 8599 532cd234e923
child 8601 4c04c7785cba
build fixes for most WinRT-related files

Still TODO: getting the D3D11 renderer back up and running in VC 2012.
VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj
VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj.filters
src/core/winrt/SDL_winrtapp_direct3d.cpp
src/core/winrt/SDL_winrtapp_xaml.cpp
src/filesystem/winrt/SDL_sysfilesystem.cpp
src/thread/stdcpp/SDL_syscond.cpp
src/thread/stdcpp/SDL_sysmutex.cpp
src/thread/stdcpp/SDL_systhread.cpp
src/video/winrt/SDL_winrtkeyboard.cpp
src/video/winrt/SDL_winrtmouse.cpp
src/video/winrt/SDL_winrtvideo.cpp
     1.1 --- a/VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj	Mon Mar 10 17:19:19 2014 -0700
     1.2 +++ b/VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj	Mon Mar 10 21:21:35 2014 -0400
     1.3 @@ -96,14 +96,7 @@
     1.4      <ClCompile Include="..\..\src\joystick\SDL_joystick.c" />
     1.5      <ClCompile Include="..\..\src\joystick\winrt\SDL_xinputjoystick.c" />
     1.6      <ClCompile Include="..\..\src\loadso\windows\SDL_sysloadso.c" />
     1.7 -    <ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11.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_d3d11.c" />
    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_render.c" />
    1.19 @@ -301,6 +294,7 @@
    1.20      <ClInclude Include="..\..\src\SDL_error_c.h" />
    1.21      <ClInclude Include="..\..\src\SDL_fatal.h" />
    1.22      <ClInclude Include="..\..\src\SDL_hints_c.h" />
    1.23 +    <ClInclude Include="..\..\src\SDL_internal.h" />
    1.24      <ClInclude Include="..\..\src\thread\SDL_systhread.h" />
    1.25      <ClInclude Include="..\..\src\thread\SDL_thread_c.h" />
    1.26      <ClInclude Include="..\..\src\thread\stdcpp\SDL_sysmutex_c.h" />
     2.1 --- a/VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj.filters	Mon Mar 10 17:19:19 2014 -0700
     2.2 +++ b/VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj.filters	Mon Mar 10 21:21:35 2014 -0400
     2.3 @@ -229,9 +229,6 @@
     2.4      <ClCompile Include="..\..\src\cpuinfo\SDL_cpuinfo.c">
     2.5        <Filter>Source Files</Filter>
     2.6      </ClCompile>
     2.7 -    <ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11.cpp">
     2.8 -      <Filter>Source Files</Filter>
     2.9 -    </ClCompile>
    2.10      <ClCompile Include="..\..\src\joystick\SDL_gamecontroller.c">
    2.11        <Filter>Source Files</Filter>
    2.12      </ClCompile>
    2.13 @@ -280,6 +277,9 @@
    2.14      <ClCompile Include="..\..\src\render\opengles2\SDL_shaders_gles2.c">
    2.15        <Filter>Source Files</Filter>
    2.16      </ClCompile>
    2.17 +    <ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11.c">
    2.18 +      <Filter>Source Files</Filter>
    2.19 +    </ClCompile>
    2.20    </ItemGroup>
    2.21    <ItemGroup>
    2.22      <ClInclude Include="..\..\include\begin_code.h">
    2.23 @@ -633,6 +633,9 @@
    2.24      <ClInclude Include="..\..\src\render\opengles2\SDL_shaders_gles2.h">
    2.25        <Filter>Source Files</Filter>
    2.26      </ClInclude>
    2.27 +    <ClInclude Include="..\..\src\SDL_internal.h">
    2.28 +      <Filter>Source Files</Filter>
    2.29 +    </ClInclude>
    2.30    </ItemGroup>
    2.31    <ItemGroup>
    2.32      <Filter Include="Header Files">
     3.1 --- a/src/core/winrt/SDL_winrtapp_direct3d.cpp	Mon Mar 10 17:19:19 2014 -0700
     3.2 +++ b/src/core/winrt/SDL_winrtapp_direct3d.cpp	Mon Mar 10 21:21:35 2014 -0400
     3.3 @@ -26,6 +26,7 @@
     3.4  
     3.5  /* SDL includes */
     3.6  extern "C" {
     3.7 +#include "../../SDL_internal.h"
     3.8  #include "SDL_assert.h"
     3.9  #include "SDL_events.h"
    3.10  #include "SDL_hints.h"
     4.1 --- a/src/core/winrt/SDL_winrtapp_xaml.cpp	Mon Mar 10 17:19:19 2014 -0700
     4.2 +++ b/src/core/winrt/SDL_winrtapp_xaml.cpp	Mon Mar 10 21:21:35 2014 -0400
     4.3 @@ -29,6 +29,7 @@
     4.4  
     4.5  
     4.6  /* SDL includes */
     4.7 +#include "../../SDL_internal.h"
     4.8  #include "SDL.h"
     4.9  #include "../../video/winrt/SDL_winrtevents_c.h"
    4.10  #include "../../video/winrt/SDL_winrtvideo_cpp.h"
     5.1 --- a/src/filesystem/winrt/SDL_sysfilesystem.cpp	Mon Mar 10 17:19:19 2014 -0700
     5.2 +++ b/src/filesystem/winrt/SDL_sysfilesystem.cpp	Mon Mar 10 21:21:35 2014 -0400
     5.3 @@ -2,7 +2,7 @@
     5.4     TODO, WinRT: remove the need to compile this with C++/CX (/ZW) extensions, and if possible, without C++ at all
     5.5  */
     5.6  
     5.7 -#include "SDL_config.h"
     5.8 +#include "../../SDL_internal.h"
     5.9  
    5.10  #ifdef __WINRT__
    5.11  
     6.1 --- a/src/thread/stdcpp/SDL_syscond.cpp	Mon Mar 10 17:19:19 2014 -0700
     6.2 +++ b/src/thread/stdcpp/SDL_syscond.cpp	Mon Mar 10 21:21:35 2014 -0400
     6.3 @@ -18,7 +18,7 @@
     6.4       misrepresented as being the original software.
     6.5    3. This notice may not be removed or altered from any source distribution.
     6.6  */
     6.7 -#include "SDL_config.h"
     6.8 +#include "../../SDL_internal.h"
     6.9  
    6.10  extern "C" {
    6.11  #include "SDL_thread.h"
     7.1 --- a/src/thread/stdcpp/SDL_sysmutex.cpp	Mon Mar 10 17:19:19 2014 -0700
     7.2 +++ b/src/thread/stdcpp/SDL_sysmutex.cpp	Mon Mar 10 21:21:35 2014 -0400
     7.3 @@ -18,7 +18,7 @@
     7.4       misrepresented as being the original software.
     7.5    3. This notice may not be removed or altered from any source distribution.
     7.6  */
     7.7 -#include "SDL_config.h"
     7.8 +#include "../../SDL_internal.h"
     7.9  
    7.10  extern "C" {
    7.11  #include "SDL_thread.h"
     8.1 --- a/src/thread/stdcpp/SDL_systhread.cpp	Mon Mar 10 17:19:19 2014 -0700
     8.2 +++ b/src/thread/stdcpp/SDL_systhread.cpp	Mon Mar 10 21:21:35 2014 -0400
     8.3 @@ -18,7 +18,7 @@
     8.4       misrepresented as being the original software.
     8.5    3. This notice may not be removed or altered from any source distribution.
     8.6  */
     8.7 -#include "SDL_config.h"
     8.8 +#include "../../SDL_internal.h"
     8.9  
    8.10  /* Thread management routines for SDL */
    8.11  
     9.1 --- a/src/video/winrt/SDL_winrtkeyboard.cpp	Mon Mar 10 17:19:19 2014 -0700
     9.2 +++ b/src/video/winrt/SDL_winrtkeyboard.cpp	Mon Mar 10 21:21:35 2014 -0400
     9.3 @@ -18,7 +18,7 @@
     9.4       misrepresented as being the original software.
     9.5    3. This notice may not be removed or altered from any source distribution.
     9.6  */
     9.7 -#include "SDL_config.h"
     9.8 +#include "../../SDL_internal.h"
     9.9  
    9.10  #if SDL_VIDEO_DRIVER_WINRT
    9.11  
    10.1 --- a/src/video/winrt/SDL_winrtmouse.cpp	Mon Mar 10 17:19:19 2014 -0700
    10.2 +++ b/src/video/winrt/SDL_winrtmouse.cpp	Mon Mar 10 21:21:35 2014 -0400
    10.3 @@ -19,7 +19,7 @@
    10.4    3. This notice may not be removed or altered from any source distribution.
    10.5  */
    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_winrtvideo.cpp	Mon Mar 10 17:19:19 2014 -0700
    11.2 +++ b/src/video/winrt/SDL_winrtvideo.cpp	Mon Mar 10 21:21:35 2014 -0400
    11.3 @@ -18,7 +18,7 @@
    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 -#include "SDL_config.h"
    11.8 +#include "../../SDL_internal.h"
    11.9  
   11.10  #if SDL_VIDEO_DRIVER_WINRT
   11.11