From bcc9c50b50ba3521dc5bc39d823f781173885ca4 Mon Sep 17 00:00:00 2001 From: Donald Carr Date: Fri, 4 May 2012 21:38:12 +0000 Subject: Introduce Arch Linux specific link line to pi mkspec Change-Id: I77c99a2f5e25c28ad2d4a13e3b56d3603cd5bb64 Reviewed-by: Girish Ramakrishnan --- mkspecs/devices/linux-rasp-pi-g++/qmake.conf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf index 079c07830e..0e3314c96c 100644 --- a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf +++ b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf @@ -32,7 +32,12 @@ QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy QMAKE_STRIP = $${CROSS_COMPILE}strip #Circular dependency in GLES2 <-> EGL requires the following abomination -QMAKE_LIBS_EGL = -L$$[QT_SYSROOT]/opt/vc/lib -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil +contains(DISTRO, arch) { + QMAKE_LIBS_EGL = -L$$[QT_SYSROOT]/opt/vc/lib -lWFC -lGLESv2 -lEGL -lbcm_host -lvcos -lopenmaxil +} else { + QMAKE_LIBS_EGL = -L$$[QT_SYSROOT]/opt/vc/lib -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil +} + QMAKE_LIBS_OPENGL_ES2 = $${QMAKE_LIBS_EGL} QMAKE_LIBS_OPENVG = $${QMAKE_LIBS_EGL} -- cgit v1.2.3