rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-10 18:24:11 +01:00
Code Issues Releases Activity

LP-29 osgearth copydata is now conditionned by copyosg variable + minor review comments

Browse Source
This commit is contained in:
Philippe Renon 2015-08-30 21:29:13 +02:00
parent e380620587
commit 7b1c49c8bc
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ground/gcs/gcs.pri
View File

@ -153,6 +153,7 @@ macx {
GCS_DOC_PATH = $$GCS_DATA_PATH/doc GCS_DOC_PATH = $$GCS_DATA_PATH/doc
copydata = 1 copydata = 1
copyqt = 1 copyqt = 1
copyosg = 1
} else { } else {
GCS_APP_TARGET = $$GCS_SMALL_NAME GCS_APP_TARGET = $$GCS_SMALL_NAME
GCS_PATH = $$GCS_BUILD_TREE GCS_PATH = $$GCS_BUILD_TREE
@ -178,6 +179,7 @@ macx {
GCS_QT_QML_PATH = $$GCS_APP_PATH GCS_QT_QML_PATH = $$GCS_APP_PATH
copyqt = $$copydata copyqt = $$copydata
copyosg = $$copydata
} else { } else {
GCS_QT_BASEPATH = $$GCS_LIBRARY_PATH/qt5 GCS_QT_BASEPATH = $$GCS_LIBRARY_PATH/qt5
GCS_QT_LIBRARY_PATH = $$GCS_QT_BASEPATH/lib GCS_QT_LIBRARY_PATH = $$GCS_QT_BASEPATH/lib
@ -190,6 +192,7 @@ macx {
} else { } else {
copyqt = 0 copyqt = 0
} }
copyosg = 1
} }
} }

4
ground/gcs/src/libs/osgearth/copydata.pro
View File

@ -1,13 +1,13 @@
# #
# copy osg and osgearth libraries and data to build dir # copy osg and osgearth libraries and data to build dir
# #
equals(copydata, 1) { equals(copyosg, 1) {
OSG_VERSION = 3.4.0 OSG_VERSION = 3.4.0
linux { linux {
# copy osg libraries # copy osg libraries
exists($(OSG_SDK_DIR)/lib64) { exists( $${OSG_SDK_DIR}/lib64 ) {
#addCopyDirFilesTargets($${OSG_SDK_DIR}/lib64,$${GCS_LIBRARY_PATH}/osg) #addCopyDirFilesTargets($${OSG_SDK_DIR}/lib64,$${GCS_LIBRARY_PATH}/osg)
} else { } else {
#addCopyDirFilesTargets($${OSG_SDK_DIR}/lib,$${GCS_LIBRARY_PATH}/osg) #addCopyDirFilesTargets($${OSG_SDK_DIR}/lib,$${GCS_LIBRARY_PATH}/osg)

6
ground/gcs/src/libs/osgearth/osgearth.pro
View File

@ -59,10 +59,10 @@ SOURCES += \
INCLUDEPATH += $$OSG_SDK_DIR/include INCLUDEPATH += $$OSG_SDK_DIR/include
linux { linux {
!exists( $(OSG_SDK_DIR)/lib64 ) { exists( $$OSG_SDK_DIR/lib64 ) {
LIBS += -L$$OSG_SDK_DIR/lib
} else {
LIBS += -L$$OSG_SDK_DIR/lib64 LIBS += -L$$OSG_SDK_DIR/lib64
} else {
LIBS += -L$$OSG_SDK_DIR/lib
} }
LIBS +=-lOpenThreads LIBS +=-lOpenThreads