diff options
| author | Donald Carr <donald.carr@nokia.com> | 2012-05-17 22:49:57 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-22 05:09:04 +0200 |
| commit | 707fc2bb00a8b2852705a3fd76426d02b5204ca4 (patch) | |
| tree | b3028d6b0203fbff49913848ddd486ce6a79a760 /mkspecs/devices/linux-rasp-pi-g++ | |
| parent | 360797208bcf45b130cae2eaaa932b269fab968b (diff) | |
| download | qtbase-707fc2bb00a8b2852705a3fd76426d02b5204ca4.tar.gz | |
Clean up Raspberry Pi spec
Introduce platform libs hook to handle/allow device specific initialization and the associated symbol resolution
Change-Id: I098b07dcb581390d369d9165c6cedc7ace1e088a
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'mkspecs/devices/linux-rasp-pi-g++')
| -rw-r--r-- | mkspecs/devices/linux-rasp-pi-g++/qmake.conf | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf index 802f0f49a2..a69b446c97 100644 --- a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf +++ b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf @@ -25,20 +25,28 @@ QMAKE_AR = $${CROSS_COMPILE}ar cqs QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy QMAKE_STRIP = $${CROSS_COMPILE}strip -#Circular dependency in GLES2 <-> EGL requires the following abomination -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_LFLAGS += -Wl,-rpath-link,$$[QT_SYSROOT]/opt/vc/lib -QMAKE_LIBS_OPENGL_ES2 = $${QMAKE_LIBS_EGL} -QMAKE_LIBS_OPENVG = $${QMAKE_LIBS_EGL} +QMAKE_LIBDIR_OPENGL_ES2 = $$[QT_SYSROOT]/opt/vc/lib +QMAKE_LIBDIR_EGL = $$QMAKE_LIBDIR_OPENGL_ES2 QMAKE_INCDIR_EGL = $$[QT_SYSROOT]/opt/vc/include QMAKE_INCDIR_OPENGL_ES2 = $${QMAKE_INCDIR_EGL} -QMAKE_CFLAGS += \ +QMAKE_LIBS_EGL = -lEGL -lGLESv2 + +contains(DISTRO, wheezy) { + QMAKE_LFLAGS += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib/arm-linux-gnueabi \ + -Wl,-rpath-link,$$[QT_SYSROOT]/lib/arm-linux-gnueabi +} else:contains(DISTRO, arch) { + #On principle: no wizardry required +} else { + #Legacy circular dependency + QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 -lEGL +} + +QMAKE_CFLAGS += \ + -marm \ -mfloat-abi=softfp \ -mfpu=vfp \ -mtune=arm1176jzf-s \ @@ -48,6 +56,7 @@ QMAKE_CFLAGS += \ QMAKE_CXXFLAGS = $$QMAKE_CFLAGS EGLFS_PLATFORM_HOOKS_SOURCES = $$PWD/qeglfshooks_pi.cpp +EGLFS_PLATFORM_HOOKS_LIBS = -lbcm_host deviceSanityCheckCompiler() |