diff --git a/ground/gcs/gcs.pri b/ground/gcs/gcs.pri index bbe138e0f..d4feb9108 100644 --- a/ground/gcs/gcs.pri +++ b/ground/gcs/gcs.pri @@ -153,6 +153,7 @@ macx { GCS_DOC_PATH = $$GCS_DATA_PATH/doc copydata = 1 copyqt = 1 + copyosg = 1 } else { GCS_APP_TARGET = $$GCS_SMALL_NAME GCS_PATH = $$GCS_BUILD_TREE @@ -178,6 +179,7 @@ macx { GCS_QT_QML_PATH = $$GCS_APP_PATH copyqt = $$copydata + copyosg = $$copydata } else { GCS_QT_BASEPATH = $$GCS_LIBRARY_PATH/qt5 GCS_QT_LIBRARY_PATH = $$GCS_QT_BASEPATH/lib @@ -190,6 +192,7 @@ macx { } else { copyqt = 0 } + copyosg = 1 } } diff --git a/ground/gcs/src/libs/osgearth/copydata.pro b/ground/gcs/src/libs/osgearth/copydata.pro index 191a01188..9d22738bd 100644 --- a/ground/gcs/src/libs/osgearth/copydata.pro +++ b/ground/gcs/src/libs/osgearth/copydata.pro @@ -1,13 +1,13 @@ # # copy osg and osgearth libraries and data to build dir # -equals(copydata, 1) { +equals(copyosg, 1) { OSG_VERSION = 3.4.0 linux { # copy osg libraries - exists($(OSG_SDK_DIR)/lib64) { + exists( $${OSG_SDK_DIR}/lib64 ) { #addCopyDirFilesTargets($${OSG_SDK_DIR}/lib64,$${GCS_LIBRARY_PATH}/osg) } else { #addCopyDirFilesTargets($${OSG_SDK_DIR}/lib,$${GCS_LIBRARY_PATH}/osg) diff --git a/ground/gcs/src/libs/osgearth/osgearth.pro b/ground/gcs/src/libs/osgearth/osgearth.pro index 042b4107c..47d15d7cf 100644 --- a/ground/gcs/src/libs/osgearth/osgearth.pro +++ b/ground/gcs/src/libs/osgearth/osgearth.pro @@ -59,10 +59,10 @@ SOURCES += \ INCLUDEPATH += $$OSG_SDK_DIR/include linux { - !exists( $(OSG_SDK_DIR)/lib64 ) { - LIBS += -L$$OSG_SDK_DIR/lib - } else { + exists( $$OSG_SDK_DIR/lib64 ) { LIBS += -L$$OSG_SDK_DIR/lib64 + } else { + LIBS += -L$$OSG_SDK_DIR/lib } LIBS +=-lOpenThreads