From 5a17e26ceae19ba189ba029f3eb9e998b42e6927 Mon Sep 17 00:00:00 2001
From: James Duley <jagduley@gmail.com>
Date: Sun, 14 Aug 2016 12:22:45 +0100
Subject: [PATCH] LP-380: default to using system qt and osg on Linux

---
 Makefile      | 7 +++++--
 make/tools.mk | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index b0d25c206..b916c719a 100644
--- a/Makefile
+++ b/Makefile
@@ -140,9 +140,12 @@ export UAVOBJGENERATOR
 GCS_BUILD_CONF := release
 
 # Set extra configuration
-GCS_EXTRA_CONF += osg copy_osg
+GCS_EXTRA_CONF += osg
+ifeq ($(UNAME), Darwin)
+    GCS_EXTRA_CONF += copy_osg
+endif
 ifeq ($(UNAME), Windows)
-    GCS_EXTRA_CONF += osgearth
+    GCS_EXTRA_CONF += osgearth copy_osg
 endif
 
 ##############################
diff --git a/make/tools.mk b/make/tools.mk
index 15ab8ff4f..2f22d0539 100644
--- a/make/tools.mk
+++ b/make/tools.mk
@@ -165,7 +165,8 @@ endif
 BUILD_SDK_TARGETS := arm_sdk
 ifeq ($(UNAME), Windows)
     BUILD_SDK_TARGETS += nsis mesawin
-else
+endif
+ifeq ($(UNAME), Darwin)
     BUILD_SDK_TARGETS += qt_sdk osg
 endif
 ALL_SDK_TARGETS := $(BUILD_SDK_TARGETS) gtest uncrustify doxygen