diff options
| author | Jorgen Lind <jorgen.lind@gmail.com> | 2012-07-17 16:32:37 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2012-08-13 14:31:56 +0200 |
| commit | ddaa441ea0923473e40d70bbe74b0b4c0e4e86b5 (patch) | |
| tree | 76fb9461619d995fd61820b6a0357c82ec932533 /src/compositor/hardware_integration | |
| parent | b7a2f76e8b1a7422721a77cfe50becafcfe27ccc (diff) | |
Make the gl integrations use the same build options as the config tests
Change-Id: I3efbd0c87c19c8ff2c382c56d2ca34bbe2e7033d
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/compositor/hardware_integration')
3 files changed, 18 insertions, 4 deletions
diff --git a/src/compositor/hardware_integration/wayland_egl/wayland_egl.pri b/src/compositor/hardware_integration/wayland_egl/wayland_egl.pri index 258923904..d1e389dac 100644 --- a/src/compositor/hardware_integration/wayland_egl/wayland_egl.pri +++ b/src/compositor/hardware_integration/wayland_egl/wayland_egl.pri @@ -1,6 +1,10 @@ -LIBS += -lEGL -DEFINES += QT_COMPOSITOR_MESA_EGL +!contains(QT_CONFIG, no-pkg-config) { + CONFIG += link_pkgconfig + PKGCONFIG += wayland-egl egl +} else { + LIBS += -lwayland-egl -lEGL +} SOURCES += \ $$PWD/waylandeglintegration.cpp diff --git a/src/compositor/hardware_integration/xcomposite_egl/xcomposite_egl.pri b/src/compositor/hardware_integration/xcomposite_egl/xcomposite_egl.pri index f4be9a259..1004fe398 100644 --- a/src/compositor/hardware_integration/xcomposite_egl/xcomposite_egl.pri +++ b/src/compositor/hardware_integration/xcomposite_egl/xcomposite_egl.pri @@ -1,6 +1,11 @@ include (../xcomposite_share/xcomposite_share.pri) -LIBS += -lXcomposite -lX11 -lEGL +!contains(QT_CONFIG, no-pkg-config) { + CONFIG += link_pkgconfig + PKGCONFIG += xcomposite egl x11 +} else { + LIBS += -lXcomposite -lEGL -lX11 +} HEADERS += \ $$PWD/xcompositeeglintegration.h diff --git a/src/compositor/hardware_integration/xcomposite_glx/xcomposite_glx.pri b/src/compositor/hardware_integration/xcomposite_glx/xcomposite_glx.pri index e8d4d0134..26281cc60 100644 --- a/src/compositor/hardware_integration/xcomposite_glx/xcomposite_glx.pri +++ b/src/compositor/hardware_integration/xcomposite_glx/xcomposite_glx.pri @@ -1,6 +1,11 @@ include (../xcomposite_share/xcomposite_share.pri) -LIBS += -lXcomposite -lX11 +!contains(QT_CONFIG, no-pkg-config) { + CONFIG += link_pkgconfig + PKGCONFIG += xcomposite gl x11 +} else { + LIBS += -lXcomposite -lGL -lX11 +} HEADERS += \ $$PWD/xcompositeglxintegration.h |