diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-10-07 20:07:07 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-16 17:10:15 +0200 |
| commit | 5d4eda78332e931394042948f9436586b221c83f (patch) | |
| tree | c30ad93a828aa9f8a598376548b1ef2ef9634eda | |
| parent | 8f0654ceb878b6c8a08c7f5b790027c26e007c13 (diff) | |
use pkg-config supplied CFLAGS when building with EGL
e.g., -DEGL_API_FB=1 is required for freescale's gpu-viv-bin-imx6 fb
driver.
Initial-patch-by: Fatih Aşıcı <fatih.asici@gmail.com>
Change-Id: I8c8cd60591605e0bc33fcf9de3bfb6ea0d86a570
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | mkspecs/features/egl.prf | 2 |
2 files changed, 3 insertions, 0 deletions
@@ -5501,6 +5501,7 @@ elif [ "$CFG_EGL" != "no" ]; then QMAKE_CFLAGS_EGL=`$PKG_CONFIG --cflags egl 2>/dev/null` QMakeVar set QMAKE_INCDIR_EGL "$QMAKE_INCDIR_EGL" QMakeVar set QMAKE_LIBS_EGL "$QMAKE_LIBS_EGL" + QMakeVar set QMAKE_CFLAGS_EGL "`echo " $QMAKE_CFLAGS_EGL " | sed -e 's, -I[^ ]* , ,g;s,^ ,,;s, $,,'`" fi # detect EGL support if compileTest qpa/egl "EGL" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then CFG_EGL=yes diff --git a/mkspecs/features/egl.prf b/mkspecs/features/egl.prf index 7e7d098236..3dd66bce53 100644 --- a/mkspecs/features/egl.prf +++ b/mkspecs/features/egl.prf @@ -14,6 +14,8 @@ wince*:contains(QT_CONFIG, opengles1) { } else { INCLUDEPATH += $$QMAKE_INCDIR_EGL LIBS_PRIVATE += $$QMAKE_LIBS_EGL + QMAKE_CFLAGS += $$QMAKE_CFLAGS_EGL + QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_EGL LIBS += $$QMAKE_LFLAGS_EGL for(p, QMAKE_LIBDIR_EGL) { exists($$p):LIBS_PRIVATE += -L$$p |