From d92f0127d0d2495bd674c5b9a82cb0cdfbd5e69a Mon Sep 17 00:00:00 2001 From: David Ludwig Date: Sat, 21 Dec 2013 10:08:11 -0500 Subject: [PATCH] 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 | 12 ++++++------ include/SDL_config_winrt.h | 7 ++----- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj b/VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj index 43bbb1a59..6a2dfb6ee 100644 --- a/VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj +++ b/VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj @@ -465,7 +465,7 @@ NotUsing false - ..\..\include;..\..\..\angleproject\include;%(AdditionalIncludeDirectories) + ..\..\include;%(AdditionalIncludeDirectories) _WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -479,7 +479,7 @@ NotUsing false - ..\..\include;..\..\..\angleproject\include;%(AdditionalIncludeDirectories) + ..\..\include;%(AdditionalIncludeDirectories) _WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -493,7 +493,7 @@ NotUsing false - ..\..\include;..\..\..\angleproject\include;%(AdditionalIncludeDirectories) + ..\..\include;%(AdditionalIncludeDirectories) _WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -507,7 +507,7 @@ NotUsing false - ..\..\include;..\..\..\angleproject\include;%(AdditionalIncludeDirectories) + ..\..\include;%(AdditionalIncludeDirectories) _WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -521,7 +521,7 @@ NotUsing false - ..\..\include;..\..\..\angleproject\include;%(AdditionalIncludeDirectories) + ..\..\include;%(AdditionalIncludeDirectories) _WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -535,7 +535,7 @@ NotUsing false - ..\..\include;..\..\..\angleproject\include;%(AdditionalIncludeDirectories) + ..\..\include;%(AdditionalIncludeDirectories) _WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) diff --git a/include/SDL_config_winrt.h b/include/SDL_config_winrt.h index 3db8c9de3..b99520544 100644 --- a/include/SDL_config_winrt.h +++ b/include/SDL_config_winrt.h @@ -168,11 +168,8 @@ typedef unsigned int uintptr_t; /* Enable OpenGL ES 2.0 (via a modified ANGLE library) */ #if WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP /* TODO, WinRT: try adding OpenGL ES 2 support for Windows Phone 8 */ -/* Uncomment the following two #defines to enable experimental OpenGL ES 2 support - (via a WinRT port of the ANGLE library). -*/ -//#define SDL_VIDEO_OPENGL_ES2 1 -//#define SDL_VIDEO_OPENGL_EGL 1 +#define SDL_VIDEO_OPENGL_ES2 1 +#define SDL_VIDEO_OPENGL_EGL 1 #endif /* Enable appropriate renderer(s) */