diff options
author | Oliver Wolff <oliver.wolff@qt.io> | 2017-05-04 10:15:23 +0200 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-05-11 08:35:54 +0000 |
commit | 3f1548ae82d4321b6fdbbf127dafbdf385374be0 (patch) | |
tree | 192268eed3cb0fea123e93c721d9319f372991fb /src/angle/src/libEGL/libEGL.pro | |
parent | 67f466505e1aed6b7f87e766141d081146b4159c (diff) |
Restore behavior of using libEGL and libGLESv2 as default for angle
As Qt applications using OpenGL are linked against these libs, merging
them into QtANGLE by default (780105f9062dec350bbe2a6800c40db3e6382578)
was a binary incompatible change. This change restores the default
behavior to the one before given change.
If the user wants the libraries to be merged, he can pass
combined-angle-lib to configure.
Task-number: QTBUG-60373
Change-Id: Iedbd3f2ce9284fdde924cfae8d915d6d5fef00db
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/angle/src/libEGL/libEGL.pro')
-rw-r--r-- | src/angle/src/libEGL/libEGL.pro | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/src/angle/src/libEGL/libEGL.pro b/src/angle/src/libEGL/libEGL.pro new file mode 100644 index 0000000000..9e9c639002 --- /dev/null +++ b/src/angle/src/libEGL/libEGL.pro @@ -0,0 +1,26 @@ +include(../common/common.pri) +DEF_FILE_TARGET = $${TARGET} +TARGET = $$qtLibraryTarget($${LIBEGL_NAME}) +winrt: LIBS_PRIVATE += -ld3d11 + +LIBS_PRIVATE += -ldxguid -L$$QT_BUILD_TREE/lib -l$$qtLibraryTarget($${LIBGLESV2_NAME}) + +DEFINES += GL_APICALL= GL_GLEXT_PROTOTYPES= EGLAPI= LIBEGL_IMPLEMENTATION + +HEADERS += \ + $$ANGLE_DIR/src/libEGL/resource.h + +SOURCES += \ + $$ANGLE_DIR/src/libEGL/libEGL.cpp + +!static { + DEF_FILE = $$ANGLE_DIR/src/libEGL/$${DEF_FILE_TARGET}.def + mingw:equals(QT_ARCH, i386): DEF_FILE = $$ANGLE_DIR/src/libEGL/$${DEF_FILE_TARGET}_mingw32.def +} + +egl_headers.files = \ + $$ANGLE_DIR/include/EGL/egl.h \ + $$ANGLE_DIR/include/EGL/eglext.h \ + $$ANGLE_DIR/include/EGL/eglplatform.h +egl_headers.path = $$[QT_INSTALL_HEADERS]/QtANGLE/EGL +INSTALLS += egl_headers |