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

LP-29 move osgearth dependencies form osgearth.pro to new osgearth_dependencies.pri

Browse Source
This commit is contained in:
Philippe Renon 2015-10-24 17:04:42 +02:00
parent ca03e2f076
commit f80fb8a02b
2 changed files with 45 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,8 @@ contains(DEFINES, OSG_USE_QT_PRIVATE) {
include(../../library.pri) include(../../library.pri)
include(../utils/utils.pri) include(../utils/utils.pri)
include(osgearth_dependencies.pri)
linux { linux {
QMAKE_RPATHDIR = $$shell_quote(\$$ORIGIN/$$relative_path($$GCS_LIBRARY_PATH/osg, $$GCS_LIBRARY_PATH)) QMAKE_RPATHDIR = $$shell_quote(\$$ORIGIN/$$relative_path($$GCS_LIBRARY_PATH/osg, $$GCS_LIBRARY_PATH))
include(../../rpath.pri) include(../../rpath.pri)
@ -23,9 +25,6 @@ macx:CONFIG += warn_off
# osg and osgearth emit a lot of unused parameter warnings... # osg and osgearth emit a lot of unused parameter warnings...
QMAKE_CXXFLAGS += -Wno-unused-parameter QMAKE_CXXFLAGS += -Wno-unused-parameter
OSG_SDK_DIR = $$clean_path($$(OSG_SDK_DIR))
message(Using osg from here: $$OSG_SDK_DIR)
HEADERS += \ HEADERS += \
osgearth_global.h \ osgearth_global.h \
utility.h \ utility.h \
@ -64,41 +63,4 @@ SOURCES += \
osgQtQuick/OSGCamera.cpp \ osgQtQuick/OSGCamera.cpp \
osgQtQuick/OSGViewport.cpp osgQtQuick/OSGViewport.cpp
INCLUDEPATH += $$OSG_SDK_DIR/include
linux {
exists( $$OSG_SDK_DIR/lib64 ) {
LIBS += -L$$OSG_SDK_DIR/lib64
} else {
LIBS += -L$$OSG_SDK_DIR/lib
}
LIBS +=-lOpenThreads
LIBS += -losg -losgUtil -losgDB -losgGA -losgViewer -losgText -losgQt
LIBS += -losgEarth -losgEarthUtil -losgEarthFeatures -losgEarthSymbology -losgEarthAnnotation -losgEarthQt
}
macx {
LIBS += -L$$OSG_SDK_DIR/lib
LIBS += -lOpenThreads
LIBS += -losg -losgUtil -losgDB -losgGA -losgViewer -losgText -losgQt
LIBS += -losgEarth -losgEarthUtil -losgEarthFeatures -losgEarthSymbology -losgEarthAnnotation -losgEarthQt
}
win32 {
LIBS += -L$$OSG_SDK_DIR/lib
CONFIG(release, debug|release) {
LIBS += -lOpenThreads
LIBS += -losg -losgUtil -losgDB -losgGA -losgViewer -losgText -losgQt
LIBS += -losgEarth -losgEarthUtil -losgEarthFeatures -losgEarthSymbology -losgEarthAnnotation -losgEarthQt
}
CONFIG(debug, debug|release) {
LIBS += -lOpenThreadsd
LIBS += -losgd -losgUtild -losgDBd -losgGAd -losgViewerd -losgTextd -losgQtd
LIBS += -losgEarthd -losgEarthUtild -losgEarthFeaturesd -losgEarthSymbologyd -losgEarthAnnotationd -losgEarthQtd
}
}
include(copydata.pro) include(copydata.pro)

43
ground/gcs/src/libs/osgearth/osgearth_dependencies.pri Normal file
View File

@ -0,0 +1,43 @@
# osg and osgearth emit a lot of unused parameter warnings...
QMAKE_CXXFLAGS += -Wno-unused-parameter
OSG_SDK_DIR = $$clean_path($$(OSG_SDK_DIR))
message(Using osg from here: $$OSG_SDK_DIR)
INCLUDEPATH += $$OSG_SDK_DIR/include
linux {
exists( $$OSG_SDK_DIR/lib64 ) {
LIBS += -L$$OSG_SDK_DIR/lib64
} else {
LIBS += -L$$OSG_SDK_DIR/lib
}
LIBS +=-lOpenThreads
LIBS += -losg -losgUtil -losgDB -losgGA -losgFX -losgViewer -losgText -losgQt
LIBS += -losgEarth -losgEarthUtil -losgEarthFeatures -losgEarthSymbology -losgEarthAnnotation -losgEarthQt
}
macx {
LIBS += -L$$OSG_SDK_DIR/lib
LIBS += -lOpenThreads
LIBS += -losg -losgUtil -losgDB -losgGA -losgFX -losgViewer -losgText -losgQt
LIBS += -losgEarth -losgEarthUtil -losgEarthFeatures -losgEarthSymbology -losgEarthAnnotation -losgEarthQt
LIBS += -losgDB
}
win32 {
LIBS += -L$$OSG_SDK_DIR/lib
#CONFIG(release, debug|release) {
LIBS += -lOpenThreads
LIBS += -losg -losgUtil -losgDB -losgGA -losgFX -losgViewer -losgText -losgQt
LIBS += -losgEarth -losgEarthUtil -losgEarthFeatures -losgEarthSymbology -losgEarthAnnotation -losgEarthQt
#}
#CONFIG(debug, debug|release) {
# LIBS += -lOpenThreadsd
# LIBS += -losgd -losgUtild -losgDBd -losgGAd -losgFXd -losgViewerd -losgTextd -losgQtd
# LIBS += -losgEarthd -losgEarthUtild -losgEarthFeaturesd -losgEarthSymbologyd -losgEarthAnnotationd -losgEarthQtd
#}
}