rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-21 11:54:15 +01:00
Code Issues Releases Activity

LP-32 simplify osgearth dependencies

Browse Source
This commit is contained in:
Philippe Renon 2016-06-24 02:47:00 +02:00
parent a50fbcb6cd
commit b32567e5ec
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ground/gcs/src/libs/osgearth/osgearth_dependencies.pri
View File

@ -15,14 +15,9 @@ contains(QT_ARCH, x86_64) {
} }
osg { osg {
win32 { OSG_SDK_DIR = $$clean_path($$(OSG_SDK_DIR))
OSG_SDK_DIR = $$clean_path($$[QT_INSTALL_BINS]/..)
} else {
OSG_SDK_DIR = $$clean_path($$(OSG_SDK_DIR))
}
message(Using osg from here: $$OSG_SDK_DIR) message(Using osg from here: $$OSG_SDK_DIR)
linux|macx { linux|macx {
INCLUDEPATH += $$OSG_SDK_DIR/include INCLUDEPATH += $$OSG_SDK_DIR/include
LIBS += -L$$OSG_SDK_DIR/$$LIB_DIR_NAME LIBS += -L$$OSG_SDK_DIR/$$LIB_DIR_NAME
@ -37,14 +32,9 @@ osg {
} }
osgearth { osgearth {
win32 { OSGEARTH_SDK_DIR = $$clean_path($$(OSGEARTH_SDK_DIR))
OSGEARTH_SDK_DIR = $$clean_path($$[QT_INSTALL_BINS]/..)
} else {
OSGEARTH_SDK_DIR = $$clean_path($$(OSGEARTH_SDK_DIR))
}
message(Using osgearth from here: $$OSGEARTH_SDK_DIR) message(Using osgearth from here: $$OSGEARTH_SDK_DIR)
linux|macx { linux|macx {
INCLUDEPATH += $$OSGEARTH_SDK_DIR/include INCLUDEPATH += $$OSGEARTH_SDK_DIR/include
LIBS += -L$$OSGEARTH_SDK_DIR/$$LIB_DIR_NAME LIBS += -L$$OSGEARTH_SDK_DIR/$$LIB_DIR_NAME