Merge branch 'dev' of pixhawk.ethz.ch:qgroundcontrol into dev

b54faa4b · pixhawk · ba9e5a87 · 9cc031aa · b54faa4b
Commit b54faa4b authored Jan 08, 2011 by pixhawk
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

qgroundcontrol.pri qgroundcontrol.pri +1 -1

No files found.
--- a/qgroundcontrol.pri
+++ b/qgroundcontrol.pri
@@ -192,7 +192,7 @@ linux-g++ {
    DEFINES += QGC_OSG_ENABLED
    }

-    exists(/usr/include/osgEarth) | exists(/usr/local/include/osgEarth) {
+    exists(/usr/include/osgEarth):exists(/usr/include/osg) | exists(/usr/local/include/osgEarth):exists(/usr/include/osg) {
    message("Building support for osgEarth")
    DEPENDENCIES_PRESENT += osgearth
    # Include osgEarth libraries