1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00

Rework osg config options

This commit is contained in:
James Duley 2016-01-15 23:41:09 +00:00
parent eb2e64b880
commit 72560638c8
5 changed files with 17 additions and 19 deletions

View File

@ -82,10 +82,6 @@ One of the projects primary goals is to provide an open and collaborative env
endef
# Set up default build configurations (debug | release)
GCS_BUILD_CONF := release
GOOGLE_API_VERSION := 14
# Clean out undesirable variables from the environment and command-line
# to remove the chance that they will cause problems with our build
define SANITIZE_VAR
@ -149,6 +145,14 @@ endif
export UAVOBJGENERATOR
# Set up default build configurations (debug | release)
GCS_BUILD_CONF := release
GCS_EXTRA_CONF := osg copy_osg
ifeq ($(UNAME), Windows)
GCS_EXTRA_CONF += osgearth
endif
##############################
#
# All targets

View File

@ -12,6 +12,6 @@ SUBDIRS = \
qwt \
sdlgamepad
exists( $(OSG_SDK_DIR) ) {
osg {
SUBDIRS += osgearth
}

View File

@ -11,6 +11,10 @@ contains(QT_ARCH, x86_64) {
LIB_DIR_NAME = lib
}
!msys2:OSG_VERSION = 3.4.0
msys2:OSG_VERSION = 3.5.1
osg:linux {
# copy osg libraries
data_copy.commands += $(MKDIR) $$GCS_LIBRARY_PATH/osg $$addNewline()

View File

@ -1,7 +1,8 @@
exists( $(OSG_SDK_DIR) ) {
osg {
DEFINES += USE_OSG
LIBS *= -l$$qtLibraryName(GCSOsgEarth)
}
exists( $(OSGEARTH_SDK_DIR) ) {
osgearth {
DEFINES += USE_OSGEARTH
}

View File

@ -4,17 +4,6 @@ DEFINES += OSGEARTH_LIBRARY
#CONFIG += mys2
CONFIG += osg
#CONFIG += osgQt
exists( $(OSGEARTH_SDK_DIR) ) {
CONFIG += osgearth
#CONFIG += osgearthQt
}
!msys2:OSG_VERSION = 3.4.0
msys2:OSG_VERSION = 3.5.1
osg:DEFINES += USE_OSG
osgQt:DEFINES += USE_OSG_QT
@ -86,4 +75,4 @@ osgearth:SOURCES += \
osgQtQuick/OSGModelNode.cpp \
osgQtQuick/OSGSkyNode.cpp
include(copydata.pro)
copy_osg:include(copydata.pro)