Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
build fixes for most WinRT-related files
Still TODO: getting the D3D11 renderer back up and running in VC 2012.
- Loading branch information
|
|
@@ -96,14 +96,7 @@ |
|
|
<ClCompile Include="..\..\src\joystick\SDL_joystick.c" /> |
|
|
<ClCompile Include="..\..\src\joystick\winrt\SDL_xinputjoystick.c" /> |
|
|
<ClCompile Include="..\..\src\loadso\windows\SDL_sysloadso.c" /> |
|
|
<ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11.cpp"> |
|
|
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</CompileAsWinRT> |
|
|
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</CompileAsWinRT> |
|
|
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</CompileAsWinRT> |
|
|
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</CompileAsWinRT> |
|
|
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</CompileAsWinRT> |
|
|
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</CompileAsWinRT> |
|
|
</ClCompile> |
|
|
<ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11.c" /> |
|
|
<ClCompile Include="..\..\src\render\opengles2\SDL_render_gles2.c" /> |
|
|
<ClCompile Include="..\..\src\render\opengles2\SDL_shaders_gles2.c" /> |
|
|
<ClCompile Include="..\..\src\render\SDL_render.c" /> |
|
|
@@ -301,6 +294,7 @@ |
|
|
<ClInclude Include="..\..\src\SDL_error_c.h" /> |
|
|
<ClInclude Include="..\..\src\SDL_fatal.h" /> |
|
|
<ClInclude Include="..\..\src\SDL_hints_c.h" /> |
|
|
<ClInclude Include="..\..\src\SDL_internal.h" /> |
|
|
<ClInclude Include="..\..\src\thread\SDL_systhread.h" /> |
|
|
<ClInclude Include="..\..\src\thread\SDL_thread_c.h" /> |
|
|
<ClInclude Include="..\..\src\thread\stdcpp\SDL_sysmutex_c.h" /> |
|
|
|
|
|
@@ -229,9 +229,6 @@ |
|
|
<ClCompile Include="..\..\src\cpuinfo\SDL_cpuinfo.c"> |
|
|
<Filter>Source Files</Filter> |
|
|
</ClCompile> |
|
|
<ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11.cpp"> |
|
|
<Filter>Source Files</Filter> |
|
|
</ClCompile> |
|
|
<ClCompile Include="..\..\src\joystick\SDL_gamecontroller.c"> |
|
|
<Filter>Source Files</Filter> |
|
|
</ClCompile> |
|
|
@@ -280,6 +277,9 @@ |
|
|
<ClCompile Include="..\..\src\render\opengles2\SDL_shaders_gles2.c"> |
|
|
<Filter>Source Files</Filter> |
|
|
</ClCompile> |
|
|
<ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11.c"> |
|
|
<Filter>Source Files</Filter> |
|
|
</ClCompile> |
|
|
</ItemGroup> |
|
|
<ItemGroup> |
|
|
<ClInclude Include="..\..\include\begin_code.h"> |
|
|
@@ -633,6 +633,9 @@ |
|
|
<ClInclude Include="..\..\src\render\opengles2\SDL_shaders_gles2.h"> |
|
|
<Filter>Source Files</Filter> |
|
|
</ClInclude> |
|
|
<ClInclude Include="..\..\src\SDL_internal.h"> |
|
|
<Filter>Source Files</Filter> |
|
|
</ClInclude> |
|
|
</ItemGroup> |
|
|
<ItemGroup> |
|
|
<Filter Include="Header Files"> |
|
|
|
|
|
@@ -26,6 +26,7 @@ using namespace Windows::Phone::UI::Input; |
|
|
|
|
|
/* SDL includes */ |
|
|
extern "C" { |
|
|
#include "../../SDL_internal.h" |
|
|
#include "SDL_assert.h" |
|
|
#include "SDL_events.h" |
|
|
#include "SDL_hints.h" |
|
|
|
|
|
@@ -29,6 +29,7 @@ |
|
|
|
|
|
|
|
|
/* SDL includes */ |
|
|
#include "../../SDL_internal.h" |
|
|
#include "SDL.h" |
|
|
#include "../../video/winrt/SDL_winrtevents_c.h" |
|
|
#include "../../video/winrt/SDL_winrtvideo_cpp.h" |
|
|
|
|
|
@@ -2,7 +2,7 @@ |
|
|
TODO, WinRT: remove the need to compile this with C++/CX (/ZW) extensions, and if possible, without C++ at all |
|
|
*/ |
|
|
|
|
|
#include "SDL_config.h" |
|
|
#include "../../SDL_internal.h" |
|
|
|
|
|
#ifdef __WINRT__ |
|
|
|
|
|
|
|
|
@@ -18,7 +18,7 @@ |
|
|
misrepresented as being the original software. |
|
|
3. This notice may not be removed or altered from any source distribution. |
|
|
*/ |
|
|
#include "SDL_config.h" |
|
|
#include "../../SDL_internal.h" |
|
|
|
|
|
extern "C" { |
|
|
#include "SDL_thread.h" |
|
|
|
|
|
@@ -18,7 +18,7 @@ |
|
|
misrepresented as being the original software. |
|
|
3. This notice may not be removed or altered from any source distribution. |
|
|
*/ |
|
|
#include "SDL_config.h" |
|
|
#include "../../SDL_internal.h" |
|
|
|
|
|
extern "C" { |
|
|
#include "SDL_thread.h" |
|
|
|
|
|
@@ -18,7 +18,7 @@ |
|
|
misrepresented as being the original software. |
|
|
3. This notice may not be removed or altered from any source distribution. |
|
|
*/ |
|
|
#include "SDL_config.h" |
|
|
#include "../../SDL_internal.h" |
|
|
|
|
|
/* Thread management routines for SDL */ |
|
|
|
|
|
|
|
|
@@ -18,7 +18,7 @@ |
|
|
misrepresented as being the original software. |
|
|
3. This notice may not be removed or altered from any source distribution. |
|
|
*/ |
|
|
#include "SDL_config.h" |
|
|
#include "../../SDL_internal.h" |
|
|
|
|
|
#if SDL_VIDEO_DRIVER_WINRT |
|
|
|
|
|
|
|
|
@@ -19,7 +19,7 @@ |
|
|
3. This notice may not be removed or altered from any source distribution. |
|
|
*/ |
|
|
|
|
|
#include "SDL_config.h" |
|
|
#include "../../SDL_internal.h" |
|
|
|
|
|
#if SDL_VIDEO_DRIVER_WINRT |
|
|
|
|
|
|
|
|
@@ -18,7 +18,7 @@ |
|
|
misrepresented as being the original software. |
|
|
3. This notice may not be removed or altered from any source distribution. |
|
|
*/ |
|
|
#include "SDL_config.h" |
|
|
#include "../../SDL_internal.h" |
|
|
|
|
|
#if SDL_VIDEO_DRIVER_WINRT |
|
|
|
|
|
|
