diff options
author | Tom Hochstein <tom.hochstein@nxp.com> | 2017-01-10 17:39:22 -0600 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2017-01-11 10:56:36 -0200 |
commit | 80d7b4e5d58f5819ca910adc55f37b54ff5a02d1 (patch) | |
tree | 6df65b74e601f0f9f4b2eca2f8b815f82b0816e8 /dynamic-layers | |
parent | 218f9261c986344802b33194ff7d7d4018fbfc2a (diff) | |
download | meta-freescale-80d7b4e5d58f5819ca910adc55f37b54ff5a02d1.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>
Diffstat (limited to 'dynamic-layers')
-rw-r--r-- | dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 14 |
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 |
26 | IMX6_CFLAGS = -DLINUX=1 -DEGL_API_FB=1 | ||
27 | EGLFS_DEVICE_INTEGRATION = eglfs_viv | 25 | EGLFS_DEVICE_INTEGRATION = eglfs_viv |
28 | EOF | 26 | EOF |
29 | else | ||
30 | cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF | ||
31 | IMX6_CFLAGS = -DLINUX=1 | ||
32 | EOF | ||
33 | fi | 27 | fi |
34 | else | ||
35 | cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF | ||
36 | IMX6_CFLAGS = -DLINUX=1 | ||
37 | EOF | ||
38 | fi | 28 | fi |
39 | cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF | 29 | cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF |
40 | QMAKE_LIBS_EGL += -lEGL | 30 | QMAKE_LIBS_EGL += -lEGL |
41 | QMAKE_LIBS_OPENGL_ES2 += -lGLESv2 -lEGL -lGAL | 31 | QMAKE_LIBS_OPENGL_ES2 += -lGLESv2 -lEGL -lGAL |
42 | QMAKE_LIBS_OPENVG += -lOpenVG -lEGL -lGAL | 32 | QMAKE_LIBS_OPENVG += -lOpenVG -lEGL -lGAL |
43 | QMAKE_CFLAGS_RELEASE += \$\$IMX6_CFLAGS | ||
44 | QMAKE_CXXFLAGS_RELEASE += \$\$IMX6_CFLAGS | ||
45 | QMAKE_CFLAGS_DEBUG += \$\$IMX6_CFLAGS | ||
46 | QMAKE_CXXFLAGS_DEBUG += \$\$IMX6_CFLAGS | ||
47 | 33 | ||
48 | load(qt_config) | 34 | load(qt_config) |
49 | 35 | ||