From 92ef64bc7b12d62f23e21546f66c3bd495bef570 Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Wed, 27 Jan 2016 08:54:45 +0100 Subject: [PATCH] make: misc cleanups --- Makefile | 6 +++++- make/tools.mk | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 6a7eb5f43..8b1b12109 100644 --- a/Makefile +++ b/Makefile @@ -147,8 +147,12 @@ export UAVOBJGENERATOR # Set up default build configurations (debug | release) GCS_BUILD_CONF := release -GCS_EXTRA_CONF := osg copy_osg +# Set extra configuration +GCS_EXTRA_CONF := + +# osg & osgearth +GCS_EXTRA_CONF += osg copy_osg ifeq ($(UNAME), Windows) GCS_EXTRA_CONF += osgearth endif diff --git a/make/tools.mk b/make/tools.mk index a6eb35f39..1fe5788e2 100644 --- a/make/tools.mk +++ b/make/tools.mk @@ -86,24 +86,24 @@ $(TOOL_REMOVE_TARGETS): ifeq ($(UNAME), Linux) ifeq ($(ARCH), x86_64) + 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 - QT_SDK_ARCH := gcc_64 OSG_URL := http://librepilot.github.io/tools/osg-3.4-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 - QT_SDK_ARCH := gcc OSG_URL := http://librepilot.github.io/tools/osg-3.4-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 DOXYGEN_URL := http://librepilot.github.io/tools/doxygen-1.8.3.1.src.tar.gz else ifeq ($(UNAME), Darwin) + QT_SDK_ARCH := clang_64 QT_SDK_URL := http://download.qt.io/official_releases/qt/5.5/5.5.1/qt-opensource-mac-x64-clang-5.5.1.dmg QT_SDK_MD5_URL := http://download.qt.io/official_releases/qt/5.5/5.5.1/qt-opensource-mac-x64-clang-5.5.1.dmg.md5 - QT_SDK_ARCH := clang_64 QT_SDK_MOUNT_DIR := /Volumes/qt-opensource-mac-x64-clang-5.5.1 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 @@ -111,9 +111,9 @@ else ifeq ($(UNAME), Darwin) OSG_URL := http://librepilot.github.io/tools/osg-3.4-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 QT_SDK_URL := http://download.qt.io/official_releases/qt/5.5/5.5.1/qt-opensource-windows-x86-mingw492-5.5.1.exe QT_SDK_MD5_URL := http://download.qt.io/official_releases/qt/5.5/5.5.1/qt-opensource-windows-x86-mingw492-5.5.1.exe.md5 - QT_SDK_ARCH := mingw492_32 NSIS_URL := http://librepilot.github.io/tools/nsis-2.46-unicode.tar.bz2 MESAWIN_URL := http://librepilot.github.io/tools/mesawin.tar.gz UNCRUSTIFY_URL := http://librepilot.github.io/tools/uncrustify-0.60-windows.tar.bz2