encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged various WinRT build fixes

This commit is contained in:
David Ludwig 2014-03-12 12:12:20 -04:00
parent b68b6e23d1 c515b79423
commit 4cd5ed7ba2
14 changed files with 212 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
VisualC-WinPhone/SDL/SDL-WinPhone_VS2012.vcxproj
View File

@ -218,7 +218,7 @@
<ClInclude Include="..\..\src\haptic\SDL_syshaptic.h" /> <ClInclude Include="..\..\src\haptic\SDL_syshaptic.h" />
<ClInclude Include="..\..\src\joystick\SDL_joystick_c.h" /> <ClInclude Include="..\..\src\joystick\SDL_joystick_c.h" />
<ClInclude Include="..\..\src\joystick\SDL_sysjoystick.h" /> <ClInclude Include="..\..\src\joystick\SDL_sysjoystick.h" />
<ClInclude Include="..\..\src\render\direct3d11\SDL_render_d3d11_winrthelpers_cpp.h" /> <ClInclude Include="..\..\src\render\direct3d11\SDL_render_winrt.h" />
<ClInclude Include="..\..\src\render\mmx.h" /> <ClInclude Include="..\..\src\render\mmx.h" />
<ClInclude Include="..\..\src\render\SDL_d3dmath.h" /> <ClInclude Include="..\..\src\render\SDL_d3dmath.h" />
<ClInclude Include="..\..\src\render\SDL_sysrender.h" /> <ClInclude Include="..\..\src\render\SDL_sysrender.h" />
@ -320,12 +320,7 @@
<ClCompile Include="..\..\src\power\SDL_power.c" /> <ClCompile Include="..\..\src\power\SDL_power.c" />
<ClCompile Include="..\..\src\power\winrt\SDL_syspower.cpp" /> <ClCompile Include="..\..\src\power\winrt\SDL_syspower.cpp" />
<ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11.c" /> <ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11.c" />
<ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11_winrthelpers.cpp"> <ClCompile Include="..\..\src\render\direct3d11\SDL_render_winrt.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>
</ClCompile>
<ClCompile Include="..\..\src\render\SDL_d3dmath.c" /> <ClCompile Include="..\..\src\render\SDL_d3dmath.c" />
<ClCompile Include="..\..\src\render\SDL_render.c" /> <ClCompile Include="..\..\src\render\SDL_render.c" />
<ClCompile Include="..\..\src\render\SDL_yuv_mmx.c" /> <ClCompile Include="..\..\src\render\SDL_yuv_mmx.c" />

12
VisualC-WinPhone/SDL/SDL-WinPhone_VS2012.vcxproj.filters
View File

@ -339,9 +339,6 @@
<ClInclude Include="..\..\include\SDL_filesystem.h"> <ClInclude Include="..\..\include\SDL_filesystem.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\render\direct3d11\SDL_render_d3d11_winrthelpers_cpp.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\render\SDL_d3dmath.h"> <ClInclude Include="..\..\src\render\SDL_d3dmath.h">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClInclude> </ClInclude>
@ -354,6 +351,9 @@
<ClInclude Include="..\..\src\dynapi\SDL_dynapi_procs.h"> <ClInclude Include="..\..\src\dynapi\SDL_dynapi_procs.h">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\render\direct3d11\SDL_render_winrt.h">
<Filter>Source Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\src\atomic\SDL_atomic.c"> <ClCompile Include="..\..\src\atomic\SDL_atomic.c">
@ -623,9 +623,6 @@
<ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11.c"> <ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11_winrthelpers.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\render\SDL_d3dmath.c"> <ClCompile Include="..\..\src\render\SDL_d3dmath.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@ -638,5 +635,8 @@
<ClCompile Include="..\..\src\power\SDL_power.c"> <ClCompile Include="..\..\src\power\SDL_power.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\render\direct3d11\SDL_render_winrt.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>

11
VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj
View File

@ -100,14 +100,7 @@
<ClCompile Include="..\..\src\power\SDL_power.c" /> <ClCompile Include="..\..\src\power\SDL_power.c" />
<ClCompile Include="..\..\src\power\winrt\SDL_syspower.cpp" /> <ClCompile Include="..\..\src\power\winrt\SDL_syspower.cpp" />
<ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11.c" /> <ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11.c" />
<ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11_winrthelpers.cpp"> <ClCompile Include="..\..\src\render\direct3d11\SDL_render_winrt.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\opengles2\SDL_render_gles2.c" /> <ClCompile Include="..\..\src\render\opengles2\SDL_render_gles2.c" />
<ClCompile Include="..\..\src\render\opengles2\SDL_shaders_gles2.c" /> <ClCompile Include="..\..\src\render\opengles2\SDL_shaders_gles2.c" />
<ClCompile Include="..\..\src\render\SDL_d3dmath.c" /> <ClCompile Include="..\..\src\render\SDL_d3dmath.c" />
@ -292,7 +285,7 @@
<ClInclude Include="..\..\src\joystick\SDL_gamecontrollerdb.h" /> <ClInclude Include="..\..\src\joystick\SDL_gamecontrollerdb.h" />
<ClInclude Include="..\..\src\joystick\SDL_joystick_c.h" /> <ClInclude Include="..\..\src\joystick\SDL_joystick_c.h" />
<ClInclude Include="..\..\src\joystick\SDL_sysjoystick.h" /> <ClInclude Include="..\..\src\joystick\SDL_sysjoystick.h" />
<ClInclude Include="..\..\src\render\direct3d11\SDL_render_d3d11_winrthelpers_cpp.h" /> <ClInclude Include="..\..\src\render\direct3d11\SDL_render_winrt.h" />
<ClInclude Include="..\..\src\render\mmx.h" /> <ClInclude Include="..\..\src\render\mmx.h" />
<ClInclude Include="..\..\src\render\opengles2\SDL_gles2funcs.h" /> <ClInclude Include="..\..\src\render\opengles2\SDL_gles2funcs.h" />
<ClInclude Include="..\..\src\render\opengles2\SDL_shaders_gles2.h" /> <ClInclude Include="..\..\src\render\opengles2\SDL_shaders_gles2.h" />

16
VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj.filters
View File

@ -280,19 +280,19 @@
<ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11.c"> <ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11_winrthelpers.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\render\SDL_d3dmath.c"> <ClCompile Include="..\..\src\render\SDL_d3dmath.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\dynapi\SDL_dynapi.c"> <ClCompile Include="..\..\src\dynapi\SDL_dynapi.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\power\winrt\SDL_syspower.cpp"> <ClCompile Include="..\..\src\power\SDL_power.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\power\SDL_power.c"> <ClCompile Include="..\..\src\render\direct3d11\SDL_render_winrt.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\power\winrt\SDL_syspower.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
@ -651,9 +651,6 @@
<ClInclude Include="..\..\src\SDL_internal.h"> <ClInclude Include="..\..\src\SDL_internal.h">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\render\direct3d11\SDL_render_d3d11_winrthelpers_cpp.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\render\SDL_d3dmath.h"> <ClInclude Include="..\..\src\render\SDL_d3dmath.h">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClInclude> </ClInclude>
@ -666,6 +663,9 @@
<ClInclude Include="..\..\src\dynapi\SDL_dynapi_procs.h"> <ClInclude Include="..\..\src\dynapi\SDL_dynapi_procs.h">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\render\direct3d11\SDL_render_winrt.h">
<Filter>Source Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="Header Files"> <Filter Include="Header Files">

8
Xcode/SDL/SDL.xcodeproj/project.pbxproj
View File

@ -2773,8 +2773,8 @@
00CFA622106A567900758660 /* Release */ = { 00CFA622106A567900758660 /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_COMPATIBILITY_VERSION = 1.0.0;
DYLIB_CURRENT_VERSION = 1; DYLIB_CURRENT_VERSION = 3.1.0;
FRAMEWORK_VERSION = A; FRAMEWORK_VERSION = A;
HEADER_SEARCH_PATHS = /usr/X11R6/include; HEADER_SEARCH_PATHS = /usr/X11R6/include;
INFOPLIST_FILE = "Info-Framework.plist"; INFOPLIST_FILE = "Info-Framework.plist";
@ -2827,8 +2827,8 @@
00CFA628106A568900758660 /* Debug */ = { 00CFA628106A568900758660 /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_COMPATIBILITY_VERSION = 1.0.0;
DYLIB_CURRENT_VERSION = 1; DYLIB_CURRENT_VERSION = 3.1.0;
FRAMEWORK_VERSION = A; FRAMEWORK_VERSION = A;
HEADER_SEARCH_PATHS = /usr/X11R6/include; HEADER_SEARCH_PATHS = /usr/X11R6/include;
INFOPLIST_FILE = "Info-Framework.plist"; INFOPLIST_FILE = "Info-Framework.plist";

3
src/core/winrt/SDL_winrtapp_xaml.cpp
View File

@ -42,7 +42,8 @@
SDL_bool WINRT_XAMLWasEnabled = SDL_FALSE; SDL_bool WINRT_XAMLWasEnabled = SDL_FALSE;
#if WINAPI_FAMILY == WINAPI_FAMILY_APP #if WINAPI_FAMILY == WINAPI_FAMILY_APP
extern "C" ISwapChainBackgroundPanelNative * WINRT_GlobalSwapChainBackgroundPanelNative = NULL; extern "C"
ISwapChainBackgroundPanelNative * WINRT_GlobalSwapChainBackgroundPanelNative = NULL;
static Windows::Foundation::EventRegistrationToken WINRT_XAMLAppEventToken; static Windows::Foundation::EventRegistrationToken WINRT_XAMLAppEventToken;
#endif #endif

2
src/joystick/winrt/SDL_xinputjoystick.c
View File

@ -18,7 +18,7 @@
misrepresented as being the original software. misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#include "SDL_config.h" #include "../../SDL_internal.h"
#if SDL_JOYSTICK_XINPUT #if SDL_JOYSTICK_XINPUT

2
src/render/direct3d11/SDL_render_d3d11.c
View File

@ -35,7 +35,7 @@
#ifdef __WINRT__ #ifdef __WINRT__
#include "SDL_render_d3d11_winrthelpers_cpp.h" #include "SDL_render_winrt.h"
#if WINAPI_FAMILY == WINAPI_FAMILY_APP #if WINAPI_FAMILY == WINAPI_FAMILY_APP
#include <windows.ui.xaml.media.dxinterop.h> #include <windows.ui.xaml.media.dxinterop.h>

47
src/render/direct3d11/SDL_render_d3d11_winrthelpers.cpp → src/render/direct3d11/SDL_render_winrt.cpp
View File

@ -28,17 +28,20 @@ extern "C" {
} }
#include <windows.ui.core.h> #include <windows.ui.core.h>
#include <windows.foundation.h> #include <windows.graphics.display.h>
#if WINAPI_FAMILY == WINAPI_FAMILY_APP #if WINAPI_FAMILY == WINAPI_FAMILY_APP
#include <windows.ui.xaml.media.dxinterop.h> #include <windows.ui.xaml.media.dxinterop.h>
#endif #endif
using namespace ABI;
using namespace Windows::UI::Core; using namespace Windows::UI::Core;
using namespace Windows::Graphics::Display; using namespace Windows::Graphics::Display;
#include <DXGI.h> #include <DXGI.h>
#include "SDL_render_winrt.h"
extern "C" void * extern "C" void *
D3D11_GetCoreWindowFromSDLRenderer(SDL_Renderer * renderer) D3D11_GetCoreWindowFromSDLRenderer(SDL_Renderer * renderer)
@ -77,32 +80,32 @@ D3D11_GetCoreWindowFromSDLRenderer(SDL_Renderer * renderer)
extern "C" DXGI_MODE_ROTATION extern "C" DXGI_MODE_ROTATION
D3D11_GetCurrentRotation() D3D11_GetCurrentRotation()
{ {
#if 0 /* FIXME: This doesn't compile on Visual Studio 2013 */
switch (DisplayProperties::CurrentOrientation) { switch (DisplayProperties::CurrentOrientation) {
#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP #if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
/* Windows Phone rotations */ /* Windows Phone rotations */
case DisplayOrientations::Landscape: case DisplayOrientations::Landscape:
return DXGI_MODE_ROTATION_ROTATE90; return DXGI_MODE_ROTATION_ROTATE90;
case DisplayOrientations::Portrait: case DisplayOrientations::Portrait:
return DXGI_MODE_ROTATION_IDENTITY; return DXGI_MODE_ROTATION_IDENTITY;
case DisplayOrientations::LandscapeFlipped: case DisplayOrientations::LandscapeFlipped:
return DXGI_MODE_ROTATION_ROTATE270; return DXGI_MODE_ROTATION_ROTATE270;
case DisplayOrientations::PortraitFlipped: case DisplayOrientations::PortraitFlipped:
return DXGI_MODE_ROTATION_ROTATE180; return DXGI_MODE_ROTATION_ROTATE180;
#else #else
/* Non-Windows-Phone rotations (ex: Windows 8, Windows RT) */ /* Non-Windows-Phone rotations (ex: Windows 8, Windows RT) */
case DisplayOrientations::Landscape: case DisplayOrientations::Landscape:
return DXGI_MODE_ROTATION_IDENTITY; return DXGI_MODE_ROTATION_IDENTITY;
case DisplayOrientations::Portrait: case DisplayOrientations::Portrait:
return DXGI_MODE_ROTATION_ROTATE270; return DXGI_MODE_ROTATION_ROTATE270;
case DisplayOrientations::LandscapeFlipped: case DisplayOrientations::LandscapeFlipped:
return DXGI_MODE_ROTATION_ROTATE180; return DXGI_MODE_ROTATION_ROTATE180;
case DisplayOrientations::PortraitFlipped: case DisplayOrientations::PortraitFlipped:
return DXGI_MODE_ROTATION_ROTATE90; return DXGI_MODE_ROTATION_ROTATE90;
#endif /* WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP */ #endif /* WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP */
default:
return DXGI_MODE_ROTATION_UNSPECIFIED;
} }
#endif
return DXGI_MODE_ROTATION_IDENTITY;
} }

0
src/render/direct3d11/SDL_render_d3d11_winrthelpers_cpp.h → src/render/direct3d11/SDL_render_winrt.h
View File

2
src/video/winrt/SDL_winrtevents.cpp
View File

@ -18,7 +18,7 @@
misrepresented as being the original software. misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 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 #if SDL_VIDEO_DRIVER_WINRT

1
src/video/winrt/SDL_winrtmouse.cpp
View File

@ -18,7 +18,6 @@
misrepresented as being the original software. misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#include "../../SDL_internal.h" #include "../../SDL_internal.h"
#if SDL_VIDEO_DRIVER_WINRT #if SDL_VIDEO_DRIVER_WINRT

2
src/video/winrt/SDL_winrtopengles.cpp
View File

@ -18,7 +18,7 @@
misrepresented as being the original software. misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#include "SDL_config.h" #include "../../SDL_internal.h"
// TODO: WinRT, make this file compile via C code // TODO: WinRT, make this file compile via C code

2
src/video/winrt/SDL_winrtpointerinput.cpp
View File

@ -18,7 +18,7 @@
misrepresented as being the original software. misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 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 #if SDL_VIDEO_DRIVER_WINRT