diff options
| author | Thomas Senyk <thomas.senyk@pelagicore.com> | 2012-08-01 11:17:59 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-08 17:27:29 +0200 |
| commit | fcf12a214cd364c5f00bc237b4bba6619181b5d5 (patch) | |
| tree | c0bf7549ac758ce6d919ee98514b34eb4b0f9f8a /mkspecs/devices/linux-imx6-g++ | |
| parent | 101d04681f4ceb7410681eae684534a206a9d90a (diff) | |
Simplify the imx6-device-mkspec
This change is possible due to commit 18654058
As it's now possible to use configure's -sysroot without
gcc's --sysroot, it's possible to use configure's pkg-config setup
(which comes with its -sysroot). This gives the possibility to
simplify the mkspec and be in line with the other device-mkspecs
Change-Id: I0f34ec2c5c7b06334ad3c1605001c0803272b027
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Diffstat (limited to 'mkspecs/devices/linux-imx6-g++')
| -rw-r--r-- | mkspecs/devices/linux-imx6-g++/qmake.conf | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/mkspecs/devices/linux-imx6-g++/qmake.conf b/mkspecs/devices/linux-imx6-g++/qmake.conf index 870037261a..67e16f2d29 100644 --- a/mkspecs/devices/linux-imx6-g++/qmake.conf +++ b/mkspecs/devices/linux-imx6-g++/qmake.conf @@ -3,43 +3,33 @@ # # This mkspec is based and tested on the ltib-source-release 3.0.15 # Building ltib including glib, gpu-drivers and what ever you want to use (e.g. dbus or fontconfig) -# This mkspec is for the fb-version (eglfs), and not for x11 +# This mkspec is tested with a framebuffer (eglfs) configuration (not testes with X11) # A typical configure line looks like: # /home/tsenyk/qt5/qt5/configure -opensource -confirm-license -make libs -device imx6 \ # -device-option CROSS_COMPILE=/opt/freescale/usr/local/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/arm-fsl-linux-gnueabi- \ -# -device-option ROOTFS=<path-to-your-ltib-install>/rootfs \ +# -sysroot <path-to-your-ltib-install>/rootfs -no-gcc-sysroot \ # -prefix /usr/local/Trolltech/Qt5-imx6-1 # # NOTE: currently ltib doesn't produce a proper staging/sysroot-filessystem. -# If one sets -sysroot <path-to-rootfs>, the toolchain doesn't find basic binaries (e.g. crt1.o), -# therefore we can't use -sysroot for this device. -# The solution for this platform is to use a seperate device-option instead of sysroot: -# -device-option ROOTFS=<path-to-ltib-install>/rootfs +# If gcc's --sysroot is used, the toolchain doesn't find basic binaries (e.g. crt1.o), +# therefore you have to pass -no-gcc-sysroot to configure if you pass -sysroot to configure! include(../common/linux_device_pre.conf) EGLFS_PLATFORM_HOOKS_SOURCES = $$PWD/qeglfshooks_imx6.cpp -QMAKE_INCDIR = $${ROOTFS}/usr/include \ - $${ROOTFS}/usr/include/dbus-1.0 \ - $${ROOTFS}/usr/lib/dbus-1.0/include \ - $${ROOTFS}/usr/include/freetype2 -QMAKE_INCDIR_OPENGL_ES2 = $${ROOTFS}/usr/include/GLES2 +QMAKE_INCDIR += $$[QT_SYSROOT]/usr/include +QMAKE_LIBDIR += $$[QT_SYSROOT]/usr/lib +QMAKE_LIBS_EGL += -lEGL +QMAKE_LIBS_OPENGL_ES2 += -lGLESv2 -lEGL -lGAL +QMAKE_LIBS_OPENVG += -lOpenVG -lEGL -lGAL -### LIBS -QMAKE_LIBDIR = $${ROOTFS}/usr/lib +QMAKE_LFLAGS += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib -QMAKE_LIBS_EGL = -lEGL -QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 -lEGL -lGAL -QMAKE_LIBS_OPENVG = -lOpenVG -lEGL -lGAL - - -### additional FLAGS -QMAKE_LFLAGS += -Wl,-rpath-link,$${ROOTFS}/usr/lib - -QMAKE_CFLAGS_RELEASE = -O2 -march=armv7-a -mfpu=neon -DLINUX=1 -DEGL_API_FB=1 -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE +IMX6_CFLAGS = -O2 -march=armv7-a -mfpu=neon -DLINUX=1 -DEGL_API_FB=1 +QMAKE_CFLAGS_RELEASE += $$IMX6_CFLAGS +QMAKE_CXXFLAGS_RELEASE += $$IMX6_CFLAGS include(../common/linux_device_post.conf) |