diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2014-03-26 15:02:48 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-31 09:51:40 +0200 |
| commit | 673941bfa7887faabc18b19aab64d8251c5ae24c (patch) | |
| tree | 88de4578adcc649e1ae16232d874803bab784c71 /tools/qmake/mkspecs/features/gyp_generator.prf | |
| parent | 4261082975d7935e5f0f8334f9054cc71c9dba51 (diff) | |
Add SurfaceFactoryQt and OzonePlatformEglfs.
SurfaceFactoryQt::loadEGLGLES2Bindings is needed to find
and load EGL and GLES2 libraries on embedded linux.
It also provides a function to query the native display.
We are using qmake variables at compile time to detect
where we should look for the libraries at runtime.
For EGLFS we query the native display through PlatformNativeInterface.
If the resource is not exposed by Qt (pre 5.4),
then we assume EGL_DEFAULT_DISPLAY, which is the right
parameter for close to 100% of the cases anyway.
OzonePlatformEglfs is just boiler plate code.
Change-Id: I3ad08a56c50d6160be653ffb168b3f1f791e5245
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'tools/qmake/mkspecs/features/gyp_generator.prf')
| -rw-r--r-- | tools/qmake/mkspecs/features/gyp_generator.prf | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tools/qmake/mkspecs/features/gyp_generator.prf b/tools/qmake/mkspecs/features/gyp_generator.prf index 4e1b6f5bb..b5d69497b 100644 --- a/tools/qmake/mkspecs/features/gyp_generator.prf +++ b/tools/qmake/mkspecs/features/gyp_generator.prf @@ -88,11 +88,12 @@ GYP_CONTENTS += " ]," GYP_CONTENTS += " ]," } -!isEmpty(DEFINES) { - GYP_CONTENTS += " 'defines': [" - for (define, DEFINES): GYP_CONTENTS += " '$$define'," - GYP_CONTENTS += " ]," -} +GYP_CONTENTS += " 'defines': [" +for (define, DEFINES): GYP_CONTENTS += " '$$define'," +!isEmpty(QMAKE_LIBDIR_EGL): GYP_CONTENTS += " 'QT_LIBDIR_EGL=\"$${QMAKE_DIR_SEP}$$relative_path($$QMAKE_LIBDIR_EGL, $$[QT_SYSROOT])\"'," +!isEmpty(QMAKE_LIBDIR_OPENGL_ES2): GYP_CONTENTS += " 'QT_LIBDIR_GLES2=\"$${QMAKE_DIR_SEP}$$relative_path($$QMAKE_LIBDIR_OPENGL_ES2, $$[QT_SYSROOT])\"'," +GYP_CONTENTS += " ]," + !isEmpty(GYP_DYLIB_INSTALL_NAME_BASE) { GYP_CONTENTS += " 'xcode_settings': {" \ " 'DYLIB_INSTALL_NAME_BASE': '$$GYP_DYLIB_INSTALL_NAME_BASE'," \ |