Skip to content

Q
qgroundcontrol
Commit a9f8dccb authored by Lorenz Meier's avatar Lorenz Meier
Browse files
Options

Made QtOSG truly optional

parent 622283a3
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 2 deletions
qgroundcontrol.pri
View file @ a9f8dccb
...@@ -244,10 +244,15 @@ message("Compiling for linux 32") ...@@ -244,10 +244,15 @@ message("Compiling for linux 32")
-losgGA \ -losgGA \
-losgDB \ -losgDB \
-losgText \ -losgText \
-losgQt \
-lOpenThreads -lOpenThreads
DEFINES += QGC_OSG_ENABLED DEFINES += QGC_OSG_ENABLED
}
exists(/usr/include/osg/osgQt) | exists(/usr/local/include/osg/osgQt) {
message("Building support for OpenSceneGraph")
# Include OpenSceneGraph Qt libraries
LIBS += -losgQt
DEFINES += QGC_OSG_QT_ENABLED DEFINES += QGC_OSG_QT_ENABLED
} }
...@@ -327,7 +332,6 @@ linux-g++-64 { ...@@ -327,7 +332,6 @@ linux-g++-64 {
-losgGA \ -losgGA \
-losgDB \ -losgDB \
-losgText \ -losgText \
-losgQt \
-lOpenThreads -lOpenThreads
exists(/usr/local/lib64) { exists(/usr/local/lib64) {
...@@ -335,6 +339,12 @@ linux-g++-64 { ...@@ -335,6 +339,12 @@ linux-g++-64 {
} }
DEFINES += QGC_OSG_ENABLED DEFINES += QGC_OSG_ENABLED
}
exists(/usr/include/osg/osgQt) | exists(/usr/local/include/osg/osgQt) {
message("Building support for OpenSceneGraph")
# Include OpenSceneGraph Qt libraries
LIBS += -losgQt
DEFINES += QGC_OSG_QT_ENABLED DEFINES += QGC_OSG_QT_ENABLED
} }
......
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