diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-11-08 00:18:21 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-11-11 13:22:40 +0000 |
| commit | 4d3c3a08eba8d30805f18397c98e19ab9fd40722 (patch) | |
| tree | 48ac4f501c278067571004f0562bf487a798925f /src/hardwareintegration/compositor/drm-egl-server | |
| parent | 51abcc7460da76bd64d4336dcf253c571b820e71 (diff) | |
| download | qtwayland-4d3c3a08eba8d30805f18397c98e19ab9fd40722.tar.gz | |
Get rid of the egl config test and use what qtbase provides
contains(QT_CONFIG, egl) and CONFIG += egl is the only sane way to test
for and pull in EGL headers and libs. This is particularly important when
trying to be robust and guard against half-broken sysroots on embedded
where a naive PKGCONFIG += egl breaks.
Also add an EGL_WAYLAND_BUFFER_WL define to keep wayland-egl compiling.
We are not testing for that in any config tests may cause a failure in sysroots
that have parts of Mesa thrown in but pick ip an older EGL header from the
vendor's driver.
Change-Id: I7b7e6a7a91e78dbda5b6954ad08761298c538efc
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
Diffstat (limited to 'src/hardwareintegration/compositor/drm-egl-server')
| -rw-r--r-- | src/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pri | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pri b/src/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pri index cd2e2471..2ed5db68 100644 --- a/src/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pri +++ b/src/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pri @@ -1,12 +1,14 @@ INCLUDEPATH += $$PWD contains(QT_CONFIG, no-pkg-config) { - LIBS += -lwayland-server -lEGL + LIBS += -lwayland-server } else { CONFIG += link_pkgconfig - PKGCONFIG += wayland-server egl + PKGCONFIG += wayland-server } +CONFIG += egl + SOURCES += \ $$PWD/drmeglserverbufferintegration.cpp |