summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2017-01-10 17:39:22 -0600
committerOtavio Salvador <otavio@ossystems.com.br>2017-01-11 11:01:52 -0200
commite0002ee9e238c6df297deb5c52a81d44b2f451b2 (patch)
tree8b9209d373ffd483670efd9ad74a324cff0be33c
parenta7bac566df5c4e19ecb14a92626a4e8f22491e60 (diff)
downloadmeta-freescale-e0002ee9e238c6df297deb5c52a81d44b2f451b2.tar.gz
qtbase: Use compiler settings provided by IMX-GPU driver pkg-config
The IMX-GPU driver now provides compiler settings through pkg-config, so don't set them explicitly. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend14
1 files changed, 0 insertions, 14 deletions
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index f5064a84..376358cc 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -21,29 +21,15 @@ do_configure_prepend_mx6() {
21 sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf 21 sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
22 if test ${HAS_X11} -eq 0; then 22 if test ${HAS_X11} -eq 0; then
23 if [ "${IMXGPU}" = "3d" ]; then 23 if [ "${IMXGPU}" = "3d" ]; then
24
25 cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF 24 cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
26IMX6_CFLAGS = -DLINUX=1 -DEGL_API_FB=1
27EGLFS_DEVICE_INTEGRATION = eglfs_viv 25EGLFS_DEVICE_INTEGRATION = eglfs_viv
28EOF 26EOF
29 else
30 cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
31IMX6_CFLAGS = -DLINUX=1
32EOF
33 fi 27 fi
34 else
35 cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
36IMX6_CFLAGS = -DLINUX=1
37EOF
38 fi 28 fi
39 cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF 29 cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
40QMAKE_LIBS_EGL += -lEGL 30QMAKE_LIBS_EGL += -lEGL
41QMAKE_LIBS_OPENGL_ES2 += -lGLESv2 -lEGL -lGAL 31QMAKE_LIBS_OPENGL_ES2 += -lGLESv2 -lEGL -lGAL
42QMAKE_LIBS_OPENVG += -lOpenVG -lEGL -lGAL 32QMAKE_LIBS_OPENVG += -lOpenVG -lEGL -lGAL
43QMAKE_CFLAGS_RELEASE += \$\$IMX6_CFLAGS
44QMAKE_CXXFLAGS_RELEASE += \$\$IMX6_CFLAGS
45QMAKE_CFLAGS_DEBUG += \$\$IMX6_CFLAGS
46QMAKE_CXXFLAGS_DEBUG += \$\$IMX6_CFLAGS
47 33
48load(qt_config) 34load(qt_config)
49 35