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

LP-32 upgrade to OpenSceneGraph 3.5.3

Browse Source
This commit is contained in:
Philippe Renon 2016-06-24 02:46:14 +02:00
parent 16092f7f38
commit a50fbcb6cd
6 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
# copy osg and osgearth libraries and data to build dir
#
OSG_VERSION = 3.5.1
OSG_VERSION = 3.5.3
contains(QT_ARCH, x86_64) {
LIB_DIR_NAME = lib64

4
ground/gcs/src/libs/osgearth/osgQtQuick/OSGViewport.cpp
View File

@ -383,6 +383,10 @@ private:
// traits->displayNum = 0;
// }
#if OSG_VERSION_GREATER_OR_EQUAL(3, 5, 3)
// The MyQt windowing system is registered in osgearth.cpp
traits->windowingSystemPreference = "MyQt";
#endif
traits->windowDecoration = false;
traits->x = 0;
traits->y = 0;

1
ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGGeoTransformManipulator.cpp
View File

@ -38,6 +38,7 @@
#include <osgEarth/GeoData>
#include <osgEarth/MapNode>
#include <osgEarth/Terrain>
#include <QDebug>

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

@ -229,7 +229,13 @@ void QtNotifyHandler::notify(osg::NotifySeverity severity, const char *message)
}
}
#if OSG_VERSION_GREATER_OR_EQUAL(3, 5, 3)
REGISTER_WINDOWINGSYSTEMINTERFACE(MyQt, QtWindowingSystem)
#endif
void OsgEarth::initWindowingSystem()
{
#if OSG_VERSION_LESS_THAN(3, 5, 3)
osg::GraphicsContext::setWindowingSystemInterface(QtWindowingSystem::getInterface());
#endif
}

2
make/3rdparty/osgearth/osgearth.mk vendored
View File

@ -31,7 +31,7 @@ OSG_NAME_SUFIX := -qt-$(QT_VERSION)
#
################################
OSG_VERSION := 3.5.1
OSG_VERSION := 3.5.3
OSG_GIT_TAG := OpenSceneGraph-$(OSG_VERSION)
OSG_BASE_NAME := osg-$(OSG_VERSION)

10
make/tools.mk
View File

@ -94,7 +94,7 @@ ifeq ($(UNAME), Linux)
QT_SDK_ARCH := gcc_64
QT_SDK_URL := http://download.qt.io/official_releases/qt/$(QT_SHORT_VERSION)/$(QT_VERSION)/qt-opensource-linux-x64-$(QT_VERSION).run
QT_SDK_MD5_URL := http://download.qt.io/official_releases/qt/$(QT_SHORT_VERSION)/$(QT_VERSION)/md5sums.txt
OSG_URL := $(TOOLS_URL)/osg-3.5.1-linux-x64-qt-$(QT_VERSION).tar.gz
OSG_URL := $(TOOLS_URL)/osg-3.5.3-linux-x64-qt-$(QT_VERSION).tar.gz
OSGEARTH_URL := $(TOOLS_URL)/osgearth-2.7-linux-x64-qt-$(QT_VERSION).tar.gz
else
# x32 for linux no longer provided as pre-built binaries.
@ -109,7 +109,7 @@ else ifeq ($(UNAME), Darwin)
QT_SDK_MAINTENANCE_TOOL := /Volumes/qt-opensource-mac-x64-clang-$(QT_VERSION)/qt-opensource-mac-x64-clang-$(QT_VERSION).app/Contents/MacOS/qt-opensource-mac-x64-clang-$(QT_VERSION)
UNCRUSTIFY_URL := $(TOOLS_URL)/uncrustify-0.60.tar.gz
DOXYGEN_URL := $(TOOLS_URL)/doxygen-1.8.3.1.src.tar.gz
OSG_URL := $(TOOLS_URL)/osg-3.5.1-clang_64-qt-$(QT_VERSION).tar.gz
OSG_URL := $(TOOLS_URL)/osg-3.5.3-clang_64-qt-$(QT_VERSION).tar.gz
OSGEARTH_URL := $(TOOLS_URL)/osgearth-2.7-clang_64-qt-$(QT_VERSION).tar.gz
else ifeq ($(UNAME), Windows)
QT_SDK_ARCH := mingw492_32
@ -133,14 +133,14 @@ CCACHE_DIR := $(TOOLS_DIR)/ccache
ifeq ($(UNAME), Linux)
ifeq ($(ARCH), x86_64)
OSG_SDK_DIR := $(TOOLS_DIR)/osg-3.5.1-linux-x64-qt-$(QT_VERSION)
OSG_SDK_DIR := $(TOOLS_DIR)/osg-3.5.3-linux-x64-qt-$(QT_VERSION)
OSGEARTH_SDK_DIR := $(TOOLS_DIR)/osgearth-2.7-linux-x64-qt-$(QT_VERSION)
else
OSG_SDK_DIR := $(TOOLS_DIR)/osg-3.5.1-linux-x86-qt-$(QT_VERSION)
OSG_SDK_DIR := $(TOOLS_DIR)/osg-3.5.3-linux-x86-qt-$(QT_VERSION)
OSGEARTH_SDK_DIR := $(TOOLS_DIR)/osgearth-2.7-linux-x86-qt-$(QT_VERSION)
endif
else ifeq ($(UNAME), Darwin)
OSG_SDK_DIR := $(TOOLS_DIR)/osg-3.5.1-clang_64-qt-$(QT_VERSION)
OSG_SDK_DIR := $(TOOLS_DIR)/osg-3.5.3-clang_64-qt-$(QT_VERSION)
OSGEARTH_SDK_DIR := $(TOOLS_DIR)/osgearth-2.7-clang_64-qt-$(QT_VERSION)
else ifeq ($(UNAME), Windows)
ifeq ($(ARCH), x86_64)