From b97a04373e306a5c4304f5c04db269d3ff4eed1c Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <Roland.M.Winklmeier@gmail.com>
Date: Sun, 22 Nov 2015 19:41:47 +0100
Subject: [PATCH] Select externals subdir based on QMAKESPEC

refs #468
---
 externals                       |  2 +-
 mkspecs/features/common_pre.prf | 66 +++++++++------------------------
 src/xbus/xbus.pro               |  2 +-
 3 files changed, 19 insertions(+), 51 deletions(-)

diff --git a/externals b/externals
index f35c85c0f..cd6142faf 160000
--- a/externals
+++ b/externals
@@ -1 +1 @@
-Subproject commit f35c85c0f664b1087223bdee0b6209a0fb8420e6
+Subproject commit cd6142faf618253c556a6959286548d984d004cb
diff --git a/mkspecs/features/common_pre.prf b/mkspecs/features/common_pre.prf
index e63f65373..a1a844580 100644
--- a/mkspecs/features/common_pre.prf
+++ b/mkspecs/features/common_pre.prf
@@ -97,66 +97,34 @@ include(defines.pri)
 ################################
 
 # If you want to manually set the external path, uncomment the following line
-# EXTERNALDIR = /path/to/externals
+# EXTERNALSROOT = /path/to/externals
 
-isEmpty(EXTERNALDIR) {
-    EXTERNALDIR = $$(VATSIM_EXTERNAL_DIR)
+isEmpty(EXTERNALSROOT) {
+    EXTERNALSROOT = $$(VATSIM_EXTERNAL_DIR)
 }
 
-isEmpty(EXTERNALDIR) {
-    EXTERNALDIR = $$SourceRoot/externals
+isEmpty(EXTERNALSROOT) {
+    EXTERNALSROOT = $$SourceRoot/externals
 }
 
-!exists("$$EXTERNALDIR/common/include") {
-    error("Could not find externals in $$EXTERNALDIR. Please install it!")
+!exists("$$EXTERNALSROOT/common/include") {
+    error("Could not find externals in $$EXTERNALSROOT. Please install it!")
 }
 
 ################################
 # Externals
 ################################
 
-INCLUDEPATH *= $$EXTERNALDIR/common/include
+INCLUDEPATH *= $$EXTERNALSROOT/common/include
+INCLUDEPATH *= $$EXTERNALSROOT/$$basename(QMAKESPEC)/include
 
-# and the library path depending on the used compiler
-win32-msvc2013 {
-    INCLUDEPATH *= $$EXTERNALDIR/win32-vs2013/include
-    equals(WORD_SIZE,64) {
-        EXTERNALLIBS = $$EXTERNALDIR/win32-vs2013/lib64
-        LIBS *= -L$$EXTERNALLIBS
-    }
-    equals(WORD_SIZE,32) {
-        EXTERNALLIBS = $$EXTERNALDIR/win32-vs2013/lib32
-        LIBS *= -L$$EXTERNALLIBS
-    }
-    equals(WORD_SIZE,32): LIBS += -luser32
-}
-win32-g++ {
-    INCLUDEPATH *= $$EXTERNALDIR/win32-g++/include
-    equals(WORD_SIZE,64) {
-        EXTERNALLIBS = $$EXTERNALDIR/win32-g++/lib64
-        LIBS *= -L$$EXTERNALLIBS
-    }
-    equals(WORD_SIZE,32) {
-        EXTERNALLIBS = $$EXTERNALDIR/win32-g++/lib32
-        LIBS *= -L$$EXTERNALLIBS
-    }
-    LIBS += -luser32
-}
-linux-g++* {
-    equals(WORD_SIZE,64) {
-        EXTERNALLIBS = $$EXTERNALDIR/linux-g++/lib64
-        LIBS *= -L$$EXTERNALLIBS
-    }
-    equals(WORD_SIZE,32) {
-        EXTERNALLIBS = $$EXTERNALDIR/linux-g++/lib32
-        LIBS *= -L$$EXTERNALLIBS
-    }
-}
-macx-clang {
-    INCLUDEPATH *= $$EXTERNALDIR/macx-clang/include
-    equals(WORD_SIZE,64): LIBS *= -L$$EXTERNALDIR/macx-clang/lib64 -F$$EXTERNALDIR/macx-clang/lib64
-    equals(WORD_SIZE,32): LIBS *= -L$$EXTERNALDIR/macx-clang/lib32 -F$$EXTERNALDIR/macx-clang/lib32
-}
+equals(WORD_SIZE,64): EXTERNALSDIR = $$EXTERNALSROOT/$$basename(QMAKESPEC)/lib64
+equals(WORD_SIZE,32): EXTERNALSDIR = $$EXTERNALSROOT/$$basename(QMAKESPEC)/lib32
+
+LIBS *= -L$$EXTERNALSDIR
+win32: LIBS *= -luser32
+
+INCLUDEPATH *= $$EXTERNALDIR/common/include
 
 ################################
 # Platform extensions
@@ -178,4 +146,4 @@ isEmpty(QMAKE_EXTENSION_EXE) {
 
 isEmpty(PREFIX) {
     PREFIX = $$BuildRoot/dist
-}
\ No newline at end of file
+}
diff --git a/src/xbus/xbus.pro b/src/xbus/xbus.pro
index 48be12039..9a5eb1410 100644
--- a/src/xbus/xbus.pro
+++ b/src/xbus/xbus.pro
@@ -7,7 +7,7 @@ TEMPLATE = lib
 CONFIG += shared plugin
 CONFIG += blackmisc blackcore
 
-INCLUDEPATH += $$EXTERNALDIR/common/include/XPLM
+INCLUDEPATH += $$EXTERNALSROOT/common/include/XPLM
 
 win32 {
     equals(WORD_SIZE,64): LIBS += -lXPLM_64 -lXPWidgets_64