From 0d2742fe96bd3fdc6ba3528e4caa1b3502f92ba6 Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <roland.m.winklmeier@gmail.com>
Date: Sat, 21 Sep 2013 21:58:44 +0200
Subject: [PATCH] Added proper mingw identification for external libraries

---
 externals.pri | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/externals.pri b/externals.pri
index 64ba8e4c7..4aca3e1d7 100644
--- a/externals.pri
+++ b/externals.pri
@@ -8,14 +8,12 @@
 
 isEmpty(EXTERNALDIR) {
     EXTERNALDIR = $$(VATSIM_EXTERNAL_DIR)
-    message($$EXTERNALDIR)
 
 }
 
 # if no env variable is set, we use the standard path in the client folder.
 isEmpty(EXTERNALDIR) {
     EXTERNALDIR = $$TOPSRCDIR/externals
-    message($$EXTERNALDIR)
 }
 
 # Test the folder if it exists and has a include subfolder
@@ -37,9 +35,13 @@ win32:contains(QMAKE_TARGET.arch, x86) {
 }
 
 win32-g++ {
-    message("Can't figure out if MinGW version is 32 bit or 64.")
-    message("Defaulting to 64 bit. If this is not correct, change the path manually!")
-    LIBS *= -L$$EXTERNALDIR/mingw64/lib
+    MINGW = $$system($$QMAKE_CXX -Q --help=target | find \"-m64\")
+    contains(MINGW,-m64) {
+        LIBS *= -L$$EXTERNALDIR/mingw64/lib
+    }
+    else {
+        LIBS *= -L$$EXTERNALDIR/mingw32/lib
+    }
 }
 
 linux-g++-32 {