Commit c1591744 authored by ChukRhodes's avatar ChukRhodes

R.Pi2 Support

Allows QGC to run on Raspberry Pi 2 with direct framebuffer (X/startx
not needed). Memory split seems to need 128 for GPU. Qt5 needs to be
configured with "-opengl es2 -qpa eglfs -device linux-rasp-pi2-g++".
parent 93568afe
...@@ -31,6 +31,10 @@ linux { ...@@ -31,6 +31,10 @@ linux {
message("Linux build") message("Linux build")
CONFIG += LinuxBuild CONFIG += LinuxBuild
DEFINES += __STDC_LIMIT_MACROS DEFINES += __STDC_LIMIT_MACROS
} else : linux-rasp-pi2-g++ {
message("Linux R-Pi2 build")
CONFIG += LinuxBuild
DEFINES += __STDC_LIMIT_MACROS __rasp_pi2__
} else : android-g++ { } else : android-g++ {
message("Android build") message("Android build")
CONFIG += AndroidBuild MobileBuild CONFIG += AndroidBuild MobileBuild
......
...@@ -103,9 +103,6 @@ LinuxBuild { ...@@ -103,9 +103,6 @@ LinuxBuild {
# QT_INSTALL_LIBS # QT_INSTALL_LIBS
QT_LIB_LIST = \ QT_LIB_LIST = \
libicudata.so.54 \
libicui18n.so.54 \
libicuuc.so.54 \
libQt5Core.so.5 \ libQt5Core.so.5 \
libQt5DBus.so.5 \ libQt5DBus.so.5 \
libQt5Gui.so.5 \ libQt5Gui.so.5 \
...@@ -123,14 +120,24 @@ LinuxBuild { ...@@ -123,14 +120,24 @@ LinuxBuild {
libQt5Widgets.so.5 \ libQt5Widgets.so.5 \
libQt5XcbQpa.so.5 libQt5XcbQpa.so.5
!contains(DEFINES, __rasp_pi2__) {
QT_LIB_LIST += \
libicudata.so.54 \
libicui18n.so.54 \
libicuuc.so.54
}
for(QT_LIB, QT_LIB_LIST) { for(QT_LIB, QT_LIB_LIST) {
QMAKE_POST_LINK += && $$QMAKE_COPY --dereference $$[QT_INSTALL_LIBS]/$$QT_LIB $$DESTDIR/libs QMAKE_POST_LINK += && $$QMAKE_COPY --dereference $$[QT_INSTALL_LIBS]/$$QT_LIB $$DESTDIR/libs
} }
# QT_INSTALL_PLUGINS # QT_INSTALL_PLUGINS
QT_PLUGIN_LIST = \ QT_PLUGIN_LIST = \
platforms \ platforms
xcbglintegrations
!contains(DEFINES, __rasp_pi2__) {
QT_PLUGIN_LIST += xcbglintegrations
}
for(QT_PLUGIN, QT_PLUGIN_LIST) { for(QT_PLUGIN, QT_PLUGIN_LIST) {
QMAKE_POST_LINK += && $$QMAKE_COPY --dereference --recursive $$[QT_INSTALL_PLUGINS]/$$QT_PLUGIN $$DESTDIR/libs QMAKE_POST_LINK += && $$QMAKE_COPY --dereference --recursive $$[QT_INSTALL_PLUGINS]/$$QT_PLUGIN $$DESTDIR/libs
......
...@@ -34,7 +34,15 @@ This file is part of the QGROUNDCONTROL project ...@@ -34,7 +34,15 @@ This file is part of the QGROUNDCONTROL project
#include <QOpenGLFunctions> #include <QOpenGLFunctions>
#define getQOpenGLFunctions() QOpenGLContext::currentContext()->functions() #define getQOpenGLFunctions() QOpenGLContext::currentContext()->functions()
#define QOpenGLFunctionsDef QOpenGLFunctions #define QOpenGLFunctionsDef QOpenGLFunctions
#else #endif
#ifdef __rasp_pi2__
#include <QOpenGLFunctions_ES2>
#define getQOpenGLFunctions() QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_ES2>()
#define QOpenGLFunctionsDef QOpenGLFunctions_ES2
#endif
#ifndef QOpenGLFunctionsDef
#include <QOpenGLFunctions_2_0> #include <QOpenGLFunctions_2_0>
#define getQOpenGLFunctions() QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>() #define getQOpenGLFunctions() QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>()
#define QOpenGLFunctionsDef QOpenGLFunctions_2_0 #define QOpenGLFunctionsDef QOpenGLFunctions_2_0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment