diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-20 11:33:38 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-20 11:05:17 +0000 |
| commit | 5bc464f610c91b59214304c9f970393c3971a4bd (patch) | |
| tree | 9320d3f218006ff18dd3657a0e30ba952688059d /tools | |
| parent | 4e6921c6c38b0b8786a5209949791742a0e06b94 (diff) | |
Fix OpenGL for embedded builds
Sets the external ozone platform and make sure we don't set bad
QT_LIBDIR defines for libEGL and libGLESv2 when not doing cross builds.
Change-Id: I60eada3c93224a3aa3a105b007d669932516d331
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmake/mkspecs/features/gn_generator.prf | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/tools/qmake/mkspecs/features/gn_generator.prf b/tools/qmake/mkspecs/features/gn_generator.prf index 57c53935c..24a9b6716 100644 --- a/tools/qmake/mkspecs/features/gn_generator.prf +++ b/tools/qmake/mkspecs/features/gn_generator.prf @@ -146,10 +146,17 @@ for (define, DEFINES): { define = $$replace(define,\',) GN_CONTENTS += " \"$$define\"," } -!isEmpty(QMAKE_LIBDIR_EGL): - GN_CONTENTS += " \"QT_LIBDIR_EGL=\\\"$${QMAKE_DIR_SEP}$$relative_path($$QMAKE_LIBDIR_EGL, $$[QT_SYSROOT])\\\"\"," -!isEmpty(QMAKE_LIBDIR_OPENGL_ES2) - GN_CONTENTS += " \"QT_LIBDIR_GLES2=\\\"$${QMAKE_DIR_SEP}$$relative_path($$QMAKE_LIBDIR_OPENGL_ES2, $$[QT_SYSROOT])\\\"\"," +!isEmpty(QT_SYSROOT) { + !isEmpty(QMAKE_LIBDIR_EGL): + GN_CONTENTS += " \"QT_LIBDIR_EGL=\\\"$${QMAKE_DIR_SEP}$$relative_path($$QMAKE_LIBDIR_EGL, $$[QT_SYSROOT])\\\"\"," + !isEmpty(QMAKE_LIBDIR_OPENGL_ES2) + GN_CONTENTS += " \"QT_LIBDIR_GLES2=\\\"$${QMAKE_DIR_SEP}$$relative_path($$QMAKE_LIBDIR_OPENGL_ES2, $$[QT_SYSROOT])\\\"\"," +} else { + !isEmpty(QMAKE_LIBDIR_EGL): + GN_CONTENTS += " \"QT_LIBDIR_EGL=\\\"$$QMAKE_LIBDIR_EGL\\\"\"," + !isEmpty(QMAKE_LIBDIR_OPENGL_ES2) + GN_CONTENTS += " \"QT_LIBDIR_GLES2=\\\"$$QMAKE_LIBDIR_OPENGL_ES2\\\"\"," +} GN_CONTENTS += " ]" # Source files to compile |