From 956795558477a7075c99c626f11e645bf162bcfc Mon Sep 17 00:00:00 2001 From: James Goppert Date: Sun, 20 Feb 2011 12:46:43 -0500 Subject: [PATCH] Fixed linux build. --- qgroundcontrol.pri | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri index 008cf1599..a5bd6af35 100644 --- a/qgroundcontrol.pri +++ b/qgroundcontrol.pri @@ -202,7 +202,12 @@ message("Compiling for linux 32") DEPENDENCIES_PRESENT += osg # Include OpenSceneGraph libraries LIBS += -losg \ - -losgViewer + -losgViewer \ + -losgGA \ + -losgDB \ + -losgText \ + -lOpenThreads + DEFINES += QGC_OSG_ENABLED } @@ -273,7 +278,12 @@ linux-g++-64 { DEPENDENCIES_PRESENT += osg # Include OpenSceneGraph libraries LIBS += -losg \ - -losgViewer + -losgViewer \ + -losgGA \ + -losgDB \ + -losgText \ + -lOpenThreads + DEFINES += QGC_OSG_ENABLED } @@ -342,10 +352,10 @@ INCLUDEPATH += $$BASEDIR/lib/osgEarth/win32/include \ LIBS += -L$$BASEDIR/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/lib \ -losg \ -losgViewer \ - -losgGA \ - -losgDB \ - -losgText \ - -lOpenThreads + -losgGA \ + -losgDB \ + -losgText \ + -lOpenThreads DEFINES += QGC_OSG_ENABLED exists($$BASEDIR/lib/osgEarth123) { DEPENDENCIES_PRESENT += osgearth @@ -400,7 +410,7 @@ win32-g++ { debug { #DESTDIR = $$BUILDDIR/debug - CONFIG += console + CONFIG += console } release { @@ -454,3 +464,4 @@ win32-g++ { # see http://osgearth.org/wiki/FAQ for details. QMAKE_CXXFLAGS += -Wl,-E } +# vim:ts=4:sw=4:expandtab -- 2.22.0