WinRT: enabled OpenGL ES 2 support by default
authorDavid Ludwig <dludwig@pobox.com>
Sat, 21 Dec 2013 10:08:11 -0500
changeset 85490eee3a6f8c75
parent 8548 db8a89a4e633
child 8550 321f0992541c
WinRT: enabled OpenGL ES 2 support by default

A copy of ANGLE/WinRT is still needed to run OpenGL content, but is not needed to compile SDL/WinRT.
VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj
include/SDL_config_winrt.h
     1.1 --- a/VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj	Tue Dec 10 22:34:08 2013 -0500
     1.2 +++ b/VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj	Sat Dec 21 10:08:11 2013 -0500
     1.3 @@ -465,7 +465,7 @@
     1.4      <ClCompile>
     1.5        <PrecompiledHeader>NotUsing</PrecompiledHeader>
     1.6        <CompileAsWinRT>false</CompileAsWinRT>
     1.7 -      <AdditionalIncludeDirectories>..\..\include;..\..\..\angleproject\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     1.8 +      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     1.9        <PreprocessorDefinitions>_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    1.10      </ClCompile>
    1.11      <Link>
    1.12 @@ -479,7 +479,7 @@
    1.13      <ClCompile>
    1.14        <PrecompiledHeader>NotUsing</PrecompiledHeader>
    1.15        <CompileAsWinRT>false</CompileAsWinRT>
    1.16 -      <AdditionalIncludeDirectories>..\..\include;..\..\..\angleproject\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1.17 +      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1.18        <PreprocessorDefinitions>_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    1.19      </ClCompile>
    1.20      <Link>
    1.21 @@ -493,7 +493,7 @@
    1.22      <ClCompile>
    1.23        <PrecompiledHeader>NotUsing</PrecompiledHeader>
    1.24        <CompileAsWinRT>false</CompileAsWinRT>
    1.25 -      <AdditionalIncludeDirectories>..\..\include;..\..\..\angleproject\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1.26 +      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1.27        <PreprocessorDefinitions>_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    1.28      </ClCompile>
    1.29      <Link>
    1.30 @@ -507,7 +507,7 @@
    1.31      <ClCompile>
    1.32        <PrecompiledHeader>NotUsing</PrecompiledHeader>
    1.33        <CompileAsWinRT>false</CompileAsWinRT>
    1.34 -      <AdditionalIncludeDirectories>..\..\include;..\..\..\angleproject\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1.35 +      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1.36        <PreprocessorDefinitions>_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    1.37      </ClCompile>
    1.38      <Link>
    1.39 @@ -521,7 +521,7 @@
    1.40      <ClCompile>
    1.41        <PrecompiledHeader>NotUsing</PrecompiledHeader>
    1.42        <CompileAsWinRT>false</CompileAsWinRT>
    1.43 -      <AdditionalIncludeDirectories>..\..\include;..\..\..\angleproject\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1.44 +      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1.45        <PreprocessorDefinitions>_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    1.46      </ClCompile>
    1.47      <Link>
    1.48 @@ -535,7 +535,7 @@
    1.49      <ClCompile>
    1.50        <PrecompiledHeader>NotUsing</PrecompiledHeader>
    1.51        <CompileAsWinRT>false</CompileAsWinRT>
    1.52 -      <AdditionalIncludeDirectories>..\..\include;..\..\..\angleproject\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1.53 +      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1.54        <PreprocessorDefinitions>_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    1.55      </ClCompile>
    1.56      <Link>
     2.1 --- a/include/SDL_config_winrt.h	Tue Dec 10 22:34:08 2013 -0500
     2.2 +++ b/include/SDL_config_winrt.h	Sat Dec 21 10:08:11 2013 -0500
     2.3 @@ -168,11 +168,8 @@
     2.4  
     2.5  /* Enable OpenGL ES 2.0 (via a modified ANGLE library) */
     2.6  #if WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP    /* TODO, WinRT: try adding OpenGL ES 2 support for Windows Phone 8 */
     2.7 -/* Uncomment the following two #defines to enable experimental OpenGL ES 2 support
     2.8 -   (via a WinRT port of the ANGLE library).
     2.9 -*/
    2.10 -//#define SDL_VIDEO_OPENGL_ES2 1
    2.11 -//#define SDL_VIDEO_OPENGL_EGL 1
    2.12 +#define SDL_VIDEO_OPENGL_ES2 1
    2.13 +#define SDL_VIDEO_OPENGL_EGL 1
    2.14  #endif
    2.15  
    2.16  /* Enable appropriate renderer(s) */