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-29 upgrade to osg 3.5.1 to match version used on windows

Browse Source
This commit is contained in:
Philippe Renon 2016-02-07 14:16:27 +01:00 committed by Philippe Renon
parent b1292a695b
commit 05d806f6f1
3 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,8 +2,7 @@
# copy osg and osgearth libraries and data to build dir
#
# set debug suffix if needed
#win32:CONFIG(debug, debug|release):DS = "d"
OSG_VERSION = 3.5.1
contains(QT_ARCH, x86_64) {
LIB_DIR_NAME = lib64
@ -11,12 +10,8 @@ contains(QT_ARCH, x86_64) {
LIB_DIR_NAME = lib
}
win32 {
OSG_VERSION = 3.5.1
} else {
OSG_VERSION = 3.4.0
}
# set debug suffix if needed
#win32:CONFIG(debug, debug|release):DS = "d"
osg:linux {
# copy osg libraries

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

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

18
make/tools.mk
View File

@ -89,13 +89,13 @@ ifeq ($(UNAME), Linux)
QT_SDK_ARCH := gcc_64
QT_SDK_URL := http://download.qt.io/official_releases/qt/5.5/5.5.1/qt-opensource-linux-x64-5.5.1.run
QT_SDK_MD5_URL := http://download.qt.io/official_releases/qt/5.5/5.5.1/qt-opensource-linux-x64-5.5.1.run.md5
OSG_URL := http://librepilot.github.io/tools/osg-3.4.0-linux-x64-qt-5.5.1.tar.gz
OSG_URL := http://librepilot.github.io/tools/osg-3.5.1-linux-x64-qt-5.5.1.tar.gz
OSGEARTH_URL := http://librepilot.github.io/tools/osgearth-2.7-linux-x64-qt-5.5.1.tar.gz
else
QT_SDK_ARCH := gcc
QT_SDK_URL := http://download.qt.io/official_releases/qt/5.5/5.5.1/qt-opensource-linux-x86-5.5.1.run
QT_SDK_MD5_URL := http://download.qt.io/official_releases/qt/5.5/5.5.1/qt-opensource-linux-x86-5.5.1.run.md5
OSG_URL := http://librepilot.github.io/tools/osg-3.4.0-linux-x86-qt-5.5.1.tar.gz
OSG_URL := http://librepilot.github.io/tools/osg-3.5.1-linux-x86-qt-5.5.1.tar.gz
OSGEARTH_URL := http://librepilot.github.io/tools/osgearth-2.7-linux-x86-qt-5.5.1.tar.gz
endif
UNCRUSTIFY_URL := http://librepilot.github.io/tools/uncrustify-0.60.tar.gz
@ -108,7 +108,7 @@ else ifeq ($(UNAME), Darwin)
QT_SDK_MAINTENANCE_TOOL := /Volumes/qt-opensource-mac-x64-clang-5.5.1/qt-opensource-mac-x64-clang-5.5.1.app/Contents/MacOS/qt-opensource-mac-x64-clang-5.5.1
UNCRUSTIFY_URL := http://librepilot.github.io/tools/uncrustify-0.60.tar.gz
DOXYGEN_URL := http://librepilot.github.io/tools/doxygen-1.8.3.1.src.tar.gz
OSG_URL := http://librepilot.github.io/tools/osg-3.4.0-clang_64-qt-5.5.1.tar.gz
OSG_URL := http://librepilot.github.io/tools/osg-3.5.1-clang_64-qt-5.5.1.tar.gz
OSGEARTH_URL := http://librepilot.github.io/tools/osgearth-2.7-clang_64-qt-5.5.1.tar.gz
else ifeq ($(UNAME), Windows)
QT_SDK_ARCH := mingw492_32
@ -134,15 +134,15 @@ OSG_TOOLS_DIR := $(TOOLS_DIR)
ifeq ($(UNAME), Linux)
ifeq ($(ARCH), x86_64)
OSG_SDK_DIR := $(OSG_TOOLS_DIR)/osg-3.4.0-linux-x64-qt-5.5.1
OSGEARTH_SDK_DIR := $(OSG_TOOLS_DIR)/osgearth-2.7-linux-x64-qt-5.5.1
OSG_SDK_DIR := $(OSG_TOOLS_DIR)/osg-3.5.1-linux-x64-qt-$(QT_VERSION)
OSGEARTH_SDK_DIR := $(OSG_TOOLS_DIR)/osgearth-2.7-linux-x64-qt-$(QT_VERSION)
else
OSG_SDK_DIR := $(OSG_TOOLS_DIR)/osg-3.4.0-linux-x86-qt-5.5.1
OSGEARTH_SDK_DIR := $(OSG_TOOLS_DIR)/osgearth-2.7-linux-x86-qt-5.5.1
OSG_SDK_DIR := $(OSG_TOOLS_DIR)/osg-3.5.1-linux-x86-qt-$(QT_VERSION)
OSGEARTH_SDK_DIR := $(OSG_TOOLS_DIR)/osgearth-2.7-linux-x86-qt-$(QT_VERSION)
endif
else ifeq ($(UNAME), Darwin)
OSG_SDK_DIR := $(OSG_TOOLS_DIR)/osg-3.4.0-clang_64-qt-5.5.1
OSGEARTH_SDK_DIR := $(OSG_TOOLS_DIR)/osgearth-2.7-clang_64-qt-5.5.1
OSG_SDK_DIR := $(OSG_TOOLS_DIR)/osg-3.5.1-clang_64-qt-$(QT_VERSION)
OSGEARTH_SDK_DIR := $(OSG_TOOLS_DIR)/osgearth-2.7-clang_64-qt-$(QT_VERSION)
else ifeq ($(UNAME), Windows)
MINGW_DIR := $(QT_SDK_DIR)/Tools/$(QT_SDK_ARCH)
# When changing PYTHON_DIR, you must also update it in ground/gcs/src/python.pri