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

LP-29 upgraded to osg 3.4 release

Browse Source
This commit is contained in:
Philippe Renon 2015-08-31 14:15:36 +02:00
parent 7a45978815
commit 9f96c726e9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
make/tools.mk
View File

@ -64,14 +64,14 @@ ifeq ($(UNAME), Linux)
QT_SDK_URL := http://download.qt.io/official_releases/qt/5.4/5.4.1/qt-opensource-linux-x64-5.4.1.run QT_SDK_URL := http://download.qt.io/official_releases/qt/5.4/5.4.1/qt-opensource-linux-x64-5.4.1.run
QT_SDK_MD5_URL := http://download.qt.io/official_releases/qt/5.4/5.4.1/qt-opensource-linux-x64-5.4.1.run.md5 QT_SDK_MD5_URL := http://download.qt.io/official_releases/qt/5.4/5.4.1/qt-opensource-linux-x64-5.4.1.run.md5
QT_SDK_ARCH := gcc_64 QT_SDK_ARCH := gcc_64
OSG_URL := http://librepilot.github.io/tools/osg-3.4.0-rc5-linux-x64-qt-5.4.1.tar.gz OSG_URL := http://librepilot.github.io/tools/osg-3.4-linux-x64-qt-5.4.1.tar.gz
else else
ARM_SDK_URL := https://launchpad.net/gcc-arm-embedded/4.9/4.9-2014-q4-major/+download/gcc-arm-none-eabi-4_9-2014q4-20141203-linux.tar.bz2 ARM_SDK_URL := https://launchpad.net/gcc-arm-embedded/4.9/4.9-2014-q4-major/+download/gcc-arm-none-eabi-4_9-2014q4-20141203-linux.tar.bz2
ARM_SDK_MD5_URL := https://launchpad.net/gcc-arm-embedded/4.9/4.9-2014-q4-major/+download/gcc-arm-none-eabi-4_9-2014q4-20141203-linux.tar.bz2/+md5 ARM_SDK_MD5_URL := https://launchpad.net/gcc-arm-embedded/4.9/4.9-2014-q4-major/+download/gcc-arm-none-eabi-4_9-2014q4-20141203-linux.tar.bz2/+md5
QT_SDK_URL := http://download.qt.io/official_releases/qt/5.4/5.4.1/qt-opensource-linux-x86-5.4.1.run QT_SDK_URL := http://download.qt.io/official_releases/qt/5.4/5.4.1/qt-opensource-linux-x86-5.4.1.run
QT_SDK_MD5_URL := http://download.qt.io/official_releases/qt/5.4/5.4.1/qt-opensource-linux-x86-5.4.1.run.md5 QT_SDK_MD5_URL := http://download.qt.io/official_releases/qt/5.4/5.4.1/qt-opensource-linux-x86-5.4.1.run.md5
QT_SDK_ARCH := gcc QT_SDK_ARCH := gcc
OSG_URL := http://librepilot.github.io/tools/osg-3.4.0-rc5-linux-x86-qt-5.4.1.tar.gz OSG_URL := http://librepilot.github.io/tools/osg-3.4-linux-x86-qt-5.4.1.tar.gz
endif endif
UNCRUSTIFY_URL := http://librepilot.github.io/tools/uncrustify-0.60.tar.gz 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 DOXYGEN_URL := http://librepilot.github.io/tools/doxygen-1.8.3.1.src.tar.gz
@ -102,7 +102,7 @@ else ifeq ($(UNAME), Windows)
CMAKE_URL := http://www.cmake.org/files/v2.8/cmake-2.8.12.2-win32-x86.zip CMAKE_URL := http://www.cmake.org/files/v2.8/cmake-2.8.12.2-win32-x86.zip
CMAKE_MD5_URL := http://librepilot.github.io/tools/cmake-2.8.12.2-win32-x86.zip.md5 CMAKE_MD5_URL := http://librepilot.github.io/tools/cmake-2.8.12.2-win32-x86.zip.md5
MSYS_URL := http://librepilot.github.io/tools/MSYS-1.0.11.zip MSYS_URL := http://librepilot.github.io/tools/MSYS-1.0.11.zip
OSG_URL := http://librepilot.github.io/tools/osg-3.4.0-rc5-mingw491_32-qt-5.4.1.tar.gz OSG_URL := http://librepilot.github.io/tools/osg-3.4-mingw491_32-qt-5.4.1.tar.gz
endif endif
GTEST_URL := http://librepilot.github.io/tools/gtest-1.6.0.zip GTEST_URL := http://librepilot.github.io/tools/gtest-1.6.0.zip
@ -119,12 +119,12 @@ OSG_PARENT_DIR := $(TOOLS_DIR)
ifeq ($(UNAME), Linux) ifeq ($(UNAME), Linux)
ifeq ($(ARCH), x86_64) ifeq ($(ARCH), x86_64)
OSG_SDK_DIR := $(OSG_PARENT_DIR)/osg-3.4.0-rc5-linux-x64-qt-5.4.1 OSG_SDK_DIR := $(OSG_PARENT_DIR)/osg-3.4-linux-x64-qt-5.4.1
else else
OSG_SDK_DIR := $(OSG_PARENT_DIR)/osg-3.4.0-rc5-linux-x86-qt-5.4.1 OSG_SDK_DIR := $(OSG_PARENT_DIR)/osg-3.4-linux-x86-qt-5.4.1
endif endif
else ifeq ($(UNAME), Darwin) else ifeq ($(UNAME), Darwin)
OSG_SDK_DIR := $(OSG_PARENT_DIR)/osg-3.4.0-rc5-clang_64-qt-5.4.1 OSG_SDK_DIR := $(OSG_PARENT_DIR)/osg-3.4-clang_64-qt-5.4.1
else ifeq ($(UNAME), Windows) else ifeq ($(UNAME), Windows)
MINGW_DIR := $(QT_SDK_DIR)/Tools/$(QT_SDK_ARCH) MINGW_DIR := $(QT_SDK_DIR)/Tools/$(QT_SDK_ARCH)
# When changing PYTHON_DIR, you must also update it in ground/gcs/src/python.pri # When changing PYTHON_DIR, you must also update it in ground/gcs/src/python.pri
@ -136,7 +136,7 @@ else ifeq ($(UNAME), Windows)
MESAWIN_DIR := $(TOOLS_DIR)/mesawin MESAWIN_DIR := $(TOOLS_DIR)/mesawin
CMAKE_DIR := $(TOOLS_DIR)/cmake-2.8.12.2-win32-x86 CMAKE_DIR := $(TOOLS_DIR)/cmake-2.8.12.2-win32-x86
MSYS_DIR := $(TOOLS_DIR)/msys MSYS_DIR := $(TOOLS_DIR)/msys
OSG_SDK_DIR := $(OSG_PARENT_DIR)/osg-3.4.0-rc5-mingw491_32-qt-5.4.1 OSG_SDK_DIR := $(OSG_PARENT_DIR)/osg-3.4-mingw491_32-qt-5.4.1
endif endif
QT_SDK_PREFIX := $(QT_SDK_DIR) QT_SDK_PREFIX := $(QT_SDK_DIR)