Skip to content

Q
qgroundcontrol
Commit 95679555 authored by James Goppert's avatar James Goppert
Browse files
Options

Fixed linux build.

parent 9802d9fa
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 7 deletions
qgroundcontrol.pri
View file @ 95679555
...@@ -202,7 +202,12 @@ message("Compiling for linux 32") ...@@ -202,7 +202,12 @@ message("Compiling for linux 32")
DEPENDENCIES_PRESENT += osg DEPENDENCIES_PRESENT += osg
# Include OpenSceneGraph libraries # Include OpenSceneGraph libraries
LIBS += -losg \ LIBS += -losg \
-losgViewer -losgViewer \
-losgGA \
-losgDB \
-losgText \
-lOpenThreads
DEFINES += QGC_OSG_ENABLED DEFINES += QGC_OSG_ENABLED
} }
...@@ -273,7 +278,12 @@ linux-g++-64 { ...@@ -273,7 +278,12 @@ linux-g++-64 {
DEPENDENCIES_PRESENT += osg DEPENDENCIES_PRESENT += osg
# Include OpenSceneGraph libraries # Include OpenSceneGraph libraries
LIBS += -losg \ LIBS += -losg \
-losgViewer -losgViewer \
-losgGA \
-losgDB \
-losgText \
-lOpenThreads
DEFINES += QGC_OSG_ENABLED DEFINES += QGC_OSG_ENABLED
} }
...@@ -342,10 +352,10 @@ INCLUDEPATH += $$BASEDIR/lib/osgEarth/win32/include \ ...@@ -342,10 +352,10 @@ INCLUDEPATH += $$BASEDIR/lib/osgEarth/win32/include \
LIBS += -L$$BASEDIR/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/lib \ LIBS += -L$$BASEDIR/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/lib \
-losg \ -losg \
-losgViewer \ -losgViewer \
-losgGA \ -losgGA \
-losgDB \ -losgDB \
-losgText \ -losgText \
-lOpenThreads -lOpenThreads
DEFINES += QGC_OSG_ENABLED DEFINES += QGC_OSG_ENABLED
exists($$BASEDIR/lib/osgEarth123) { exists($$BASEDIR/lib/osgEarth123) {
DEPENDENCIES_PRESENT += osgearth DEPENDENCIES_PRESENT += osgearth
...@@ -400,7 +410,7 @@ win32-g++ { ...@@ -400,7 +410,7 @@ win32-g++ {
debug { debug {
#DESTDIR = $$BUILDDIR/debug #DESTDIR = $$BUILDDIR/debug
CONFIG += console CONFIG += console
} }
release { release {
...@@ -454,3 +464,4 @@ win32-g++ { ...@@ -454,3 +464,4 @@ win32-g++ {
# see http://osgearth.org/wiki/FAQ for details. # see http://osgearth.org/wiki/FAQ for details.
QMAKE_CXXFLAGS += -Wl,-E QMAKE_CXXFLAGS += -Wl,-E
} }
# vim:ts=4:sw=4:expandtab
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