AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up Raspberry Pi spec

Browse Source 
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>
This commit is contained in:
Donald Carr 2012-05-17 22:49:57 +00:00 committed by Qt by Nokia
parent 360797208b
commit 707fc2bb00
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mkspecs/devices/linux-rasp-pi-g++/qmake.conf
View File

@ -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_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()

1
src/plugins/platforms/eglfs/eglfs.pro
View File

@ -34,6 +34,7 @@ QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
!isEmpty(EGLFS_PLATFORM_HOOKS_SOURCES) {
HEADERS += $$EGLFS_PLATFORM_HOOKS_HEADERS
SOURCES += $$EGLFS_PLATFORM_HOOKS_SOURCES
LIBS += $$EGLFS_PLATFORM_HOOKS_LIBS
DEFINES += EGLFS_PLATFORM_HOOKS
}