diff options
| author | Jorgen Lind <jorgen.lind@gmail.com> | 2012-07-17 13:38:16 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2012-07-17 16:53:32 +0200 |
| commit | 32fdbf184b7478f83e4d6ff4dba3dbe150eb9e9b (patch) | |
| tree | 1987cb730c7d3503951de36bbc7a3a9418350893 /src/compositor/hardware_integration | |
| parent | 3ae60a1dbb397df2f293e62c3978c11a0d9c9453 (diff) | |
Config tests for gl integration
Change-Id: Ie7d80e7591d11aa5df87ca5d5de4cd6c03928c83
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Diffstat (limited to 'src/compositor/hardware_integration')
| -rw-r--r-- | src/compositor/hardware_integration/hardware_integration.pri | 49 |
1 files changed, 22 insertions, 27 deletions
diff --git a/src/compositor/hardware_integration/hardware_integration.pri b/src/compositor/hardware_integration/hardware_integration.pri index 372a1e1f0..c008521ac 100644 --- a/src/compositor/hardware_integration/hardware_integration.pri +++ b/src/compositor/hardware_integration/hardware_integration.pri @@ -1,6 +1,6 @@ isEmpty(QT_WAYLAND_GL_CONFIG):QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG) -!mac:!isEqual(QT_WAYLAND_GL_CONFIG,nogl) { +!isEqual(QT_WAYLAND_GL_CONFIG,nogl) { HEADERS += \ $$PWD/graphicshardwareintegration.h @@ -12,37 +12,32 @@ isEmpty(QT_WAYLAND_GL_CONFIG):QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG) isEqual(QT_WAYLAND_GL_CONFIG, custom) { QT_WAYLAND_GL_INTEGRATION = $$QT_WAYLAND_GL_CONFIG } else { - contains(QT_CONFIG, opengles2) { - isEqual(QT_WAYLAND_GL_CONFIG, xcomposite_egl) { + equals(QT_WAYLAND_GL_CONFIG, brcm_egl) { + CONFIG -= config_wayland_egl config_xcomposite + } + + equals(QT_WAYLAND_GL_CONFIG, xcomposite) { + CONFIG -= config_wayland_egl config_brcm_egl + } + + config_wayland_egl { + include (wayland_egl/wayland_egl.pri) + QT_WAYLAND_GL_INTEGRATION = wayland_egl + }else:config_brcm_egl { + include (brcm_egl/brcm_egl.pri) + QT_WAYLAND_GL_INTEGRATION = brcm_egl + }else:config_xcomposite{ + config_egl{ + include (xcomposite_egl/xcomposite_egl.pri) QT_WAYLAND_GL_INTEGRATION = xcomposite_egl - CONFIG += xcomposite_egl - } else:isEqual(QT_WAYLAND_GL_CONFIG, brcm_egl)|isEmpty(QT_WAYLAND_GL_CONFIG):config_brcm_egl { - QT_WAYLAND_GL_INTEGRATION = brcm_egl - CONFIG += brcm_egl - } else { - QT_WAYLAND_GL_INTEGRATION = wayland_egl - CONFIG += wayland_egl - DEFINES += MESA_EGL_NO_X11_HEADERS + }else:config_glx{ + include (xcomposite_glx/xcomposite_glx.pri) + QT_WAYLAND_GL_INTEGRATION = xcomposite_glx } - } else { - QT_WAYLAND_GL_INTEGRATION = xcomposite_glx - CONFIG += xcomposite_glx } } - system(echo "Qt-Compositor configured with openGL: $$QT_WAYLAND_GL_INTEGRATION") + system(echo "Qt-Compositor configured with openGL integration: $$QT_WAYLAND_GL_INTEGRATION") } else { system(echo "Qt-Compositor configured as raster only compositor") } -brcm_egl { - include (brcm_egl/brcm_egl.pri) -} -wayland_egl { - include (wayland_egl/wayland_egl.pri) -} -xcomposite_egl { - include (xcomposite_egl/xcomposite_egl.pri) -} -xcomposite_glx { - include (xcomposite_glx/xcomposite_glx.pri) -} |