From e7f1106edb1ac37d92d7851c44cd8d99f68eaaf4 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 23 May 2012 15:07:06 +0200
Subject: Windows: Add ANGLE support.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add QWindowsEGLContext usable for ANGLE and Windows CE.
- Add QWindowsEGLStaticContext containing the display
  for resource cleanup.
- Add EGLSurface to QWindowsWindow.
- Add a -angle option specifying the path to the external
  ANGLE installation to configure, add libraries to
  the mkspecs.

Initial-patch-by: Jabot Corentin <corentinjabot@gmail.com>

Task-number: QTBUG-24207

Change-Id: I5f80b1efb6996da7c5d70aa3720f7801c9e4c6af
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
---
 mkspecs/features/win32/opengl.prf | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'mkspecs/features/win32')

diff --git a/mkspecs/features/win32/opengl.prf b/mkspecs/features/win32/opengl.prf
index 3414781c39..1b1603cf74 100644
--- a/mkspecs/features/win32/opengl.prf
+++ b/mkspecs/features/win32/opengl.prf
@@ -6,6 +6,19 @@
 wince* {
     include(../unix/opengl.prf)
 } else {
-    QMAKE_LIBS += $$QMAKE_LIBS_OPENGL
-    QMAKE_LFLAGS += $$QMAKE_LFLAGS_OPENGL
+    contains(QT_CONFIG, opengles2) {
+#       For Desktop, use the ANGLE library location passed on from configure.
+        INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2
+        LIBS += $$QMAKE_LIBS_OPENGL_ES2
+        CONFIG(debug, debug|release) {
+            QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL_ES2_DEBUG
+        } else {
+            QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL_ES2_RELEASE
+        }
+        DEFINES += QT_OPENGL_ES_2 QT_OPENGL_ES_2_ANGLE
+        QT_CONFIG -= opengl
+    } else {
+        QMAKE_LIBS += $$QMAKE_LIBS_OPENGL
+        QMAKE_LFLAGS += $$QMAKE_LFLAGS_OPENGL
+    }
 }
-- 
cgit v1.2.3