114 lines
4.0 KiB
Diff
114 lines
4.0 KiB
Diff
--- src/gui/Qt5GuiConfigExtras.cmake.in 2014-12-05 09:24:36.000000000 -0700
|
|
+++ src/gui/Qt5GuiConfigExtras.cmake.in 2014-12-11 10:19:51.599972209 -0700
|
|
@@ -2,9 +2,9 @@
|
|
!!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
|
|
|
|
!!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
|
|
-set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\")
|
|
+set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\")
|
|
!!ELSE
|
|
-set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\")
|
|
+set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR\")
|
|
!!ENDIF
|
|
|
|
_qt5_Gui_check_file_exists(${Qt5Gui_EGL_INCLUDE_DIRS})
|
|
--- src/gui/gui.pro 2014-12-05 09:24:35.000000000 -0700
|
|
+++ src/gui/gui.pro 2014-12-11 10:22:37.644366784 -0700
|
|
@@ -17,12 +17,6 @@
|
|
imageformats \
|
|
egldeviceintegrations
|
|
|
|
-# This is here only because the platform plugin is no module, obviously.
|
|
-win32:contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) {
|
|
- MODULE_AUX_INCLUDES = \
|
|
- \$\$QT_MODULE_INCLUDE_BASE/QtANGLE
|
|
-}
|
|
-
|
|
load(qt_module)
|
|
|
|
# Code coverage with TestCocoon
|
|
@@ -33,6 +27,10 @@
|
|
|
|
mac:!ios: LIBS_PRIVATE += -framework Cocoa
|
|
|
|
+win32:contains(QT_CONFIG, angle) {
|
|
+ LIBS_PRIVATE += -lGLESv2
|
|
+}
|
|
+
|
|
CONFIG += simd optimize_full
|
|
|
|
include(accessible/accessible.pri)
|
|
@@ -55,13 +53,21 @@
|
|
contains(QT_CONFIG, angle) {
|
|
CMAKE_GL_INCDIRS = $$CMAKE_INCLUDE_DIR
|
|
CMAKE_ANGLE_EGL_DLL_RELEASE = libEGL.dll
|
|
- CMAKE_ANGLE_EGL_IMPLIB_RELEASE = libEGL.lib
|
|
CMAKE_ANGLE_GLES2_DLL_RELEASE = libGLESv2.dll
|
|
- CMAKE_ANGLE_GLES2_IMPLIB_RELEASE = libGLESv2.lib
|
|
CMAKE_ANGLE_EGL_DLL_DEBUG = libEGLd.dll
|
|
- CMAKE_ANGLE_EGL_IMPLIB_DEBUG = libEGLd.lib
|
|
CMAKE_ANGLE_GLES2_DLL_DEBUG = libGLESv2d.dll
|
|
- CMAKE_ANGLE_GLES2_IMPLIB_DEBUG = libGLESv2d.lib
|
|
+
|
|
+ win32-g++* {
|
|
+ CMAKE_ANGLE_EGL_IMPLIB_RELEASE = libEGL.dll.a
|
|
+ CMAKE_ANGLE_GLES2_IMPLIB_RELEASE = libGLESv2.dll.a
|
|
+ CMAKE_ANGLE_EGL_IMPLIB_DEBUG = libEGLd.dll.a
|
|
+ CMAKE_ANGLE_GLES2_IMPLIB_DEBUG = libGLESv2d.dll.a
|
|
+ } else {
|
|
+ CMAKE_ANGLE_EGL_IMPLIB_RELEASE = libEGL.lib
|
|
+ CMAKE_ANGLE_GLES2_IMPLIB_RELEASE = libGLESv2.lib
|
|
+ CMAKE_ANGLE_EGL_IMPLIB_DEBUG = libEGLd.lib
|
|
+ CMAKE_ANGLE_GLES2_IMPLIB_DEBUG = libGLESv2d.lib
|
|
+ }
|
|
|
|
CMAKE_QT_OPENGL_IMPLEMENTATION = GLESv2
|
|
} else {
|
|
--- src/opengl/opengl.pro 2014-12-05 09:24:31.000000000 -0700
|
|
+++ src/opengl/opengl.pro 2014-12-11 10:15:45.884805707 -0700
|
|
@@ -13,6 +13,10 @@
|
|
contains(QT_CONFIG, opengl):CONFIG += opengl
|
|
contains(QT_CONFIG, opengles2):CONFIG += opengles2
|
|
|
|
+win32:contains(QT_CONFIG, angle) {
|
|
+ LIBS_PRIVATE += -lGLESv2
|
|
+}
|
|
+
|
|
HEADERS += qgl.h \
|
|
qgl_p.h \
|
|
qglcolormap.h \
|
|
--- src/plugins/platforms/windows/windows.pri 2014-12-05 09:24:37.000000000 -0700
|
|
+++ src/plugins/platforms/windows/windows.pri 2014-12-11 10:13:45.228261276 -0700
|
|
@@ -3,6 +3,7 @@
|
|
!wince: LIBS *= -luser32 -lwinspool -limm32 -lwinmm -loleaut32
|
|
|
|
contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2):!contains(QT_CONFIG, dynamicgl): LIBS *= -lopengl32
|
|
+contains(QT_CONFIG, angle):LIBS += -lGLESv2 -lEGL
|
|
|
|
mingw: LIBS *= -luuid
|
|
# For the dialog helpers:
|
|
--- src/src.pro 2014-12-05 09:24:31.000000000 -0700
|
|
+++ src/src.pro 2014-12-11 10:06:14.882845813 -0700
|
|
@@ -155,10 +155,6 @@
|
|
SUBDIRS += src_3rdparty_harfbuzzng
|
|
src_gui.depends += src_3rdparty_harfbuzzng
|
|
}
|
|
- win32:contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) {
|
|
- SUBDIRS += src_angle
|
|
- src_gui.depends += src_angle
|
|
- }
|
|
contains(QT_CONFIG, freetype) {
|
|
SUBDIRS += src_3rdparty_freetype
|
|
src_platformsupport.depends += src_3rdparty_freetype
|
|
--- src/plugins/platforms/windows/qwindowseglcontext.cpp 2014-12-05 09:24:37.000000000 -0700
|
|
+++ src/plugins/platforms/windows/qwindowseglcontext.cpp 2014-12-11 20:07:27.099190408 -0700
|
|
@@ -39,7 +39,7 @@
|
|
#include <QtGui/QOpenGLContext>
|
|
|
|
#if defined(QT_OPENGL_ES_2_ANGLE) || defined(QT_OPENGL_DYNAMIC)
|
|
-# include <QtANGLE/EGL/eglext.h>
|
|
+# include <EGL/eglext.h>
|
|
#endif
|
|
|
|
QT_BEGIN_NAMESPACE
|