From f544eceaa51ea14c6f46c8afc2faf8b46c46fe63 Mon Sep 17 00:00:00 2001
From: Roy Jacobs <roy.jacobs@12roar.com>
Date: Wed, 8 Mar 2017 14:05:02 +0100
Subject: [PATCH 1/2] Improved windows host/target detection and fixed buildbot
 building

---
 monero-wallet-gui.pro | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro
index 8c22d052..109570d1 100644
--- a/monero-wallet-gui.pro
+++ b/monero-wallet-gui.pro
@@ -148,28 +148,32 @@ win32 {
     # Obtaining arch through uname should be reliable. This also fixes building the project in Qt creator without changes.
     MSYS_HOST_ARCH = $$system(uname -a | grep -o "x86_64")
 
-    # Even if host is 64bit, we are building win32 spec, so mingw path should allways be "/mingw32"
-    MSYS_MINGW_PATH=/mingw32
-    BOOST_MINGW_PATH=$$MSYS_MINGW_PATH/boost
-
-    # Win64 Host settings
+    # WIN64 Host settings
     contains(MSYS_HOST_ARCH, x86_64) {
         message("Host is 64bit")
-        MSYS_PATH=c:/msys64/mingw32
-
-        # boost root path
-        BOOST_PATH=$$MSYS_PATH/boost
+        MSYS_ROOT_PATH=c:/msys64
 
     # WIN32 Host settings
     } else {
         message("Host is 32bit")
-        MSYS_PATH=c:/msys32/mingw32
-
-        # boost root path
-        BOOST_PATH=$$MSYS_PATH/boost
-
+        MSYS_ROOT_PATH=c:/msys32
     }
 
+    # WIN64 Target settings
+    contains(QMAKE_HOST.arch, x86_64) {
+        MSYS_MINGW_PATH=/mingw32
+
+    # WIN32 Target settings
+    } else {
+        MSYS_MINGW_PATH=/mingw64
+    }
+    
+    MSYS_PATH=$$MSYS_ROOT_PATH$$MSYS_MINGW_PATH
+
+    # boost root path
+    BOOST_PATH=$$MSYS_PATH/boost
+    BOOST_MINGW_PATH=$$MSYS_MINGW_PATH/boost
+
     LIBS+=-L$$MSYS_PATH/lib
     LIBS+=-L$$MSYS_MINGW_PATH/lib
     LIBS+=-L$$BOOST_PATH/lib

From 27bc424f04200646315627c9dacdf1a943d802d2 Mon Sep 17 00:00:00 2001
From: Roy Jacobs <roy.jacobs@12roar.com>
Date: Wed, 8 Mar 2017 14:21:35 +0100
Subject: [PATCH 2/2] Fixed mingw path

---
 monero-wallet-gui.pro | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro
index 109570d1..0dca61bc 100644
--- a/monero-wallet-gui.pro
+++ b/monero-wallet-gui.pro
@@ -161,11 +161,11 @@ win32 {
 
     # WIN64 Target settings
     contains(QMAKE_HOST.arch, x86_64) {
-        MSYS_MINGW_PATH=/mingw32
+        MSYS_MINGW_PATH=/mingw64
 
     # WIN32 Target settings
     } else {
-        MSYS_MINGW_PATH=/mingw64
+        MSYS_MINGW_PATH=/mingw32
     }
     
     MSYS_PATH=$$MSYS_ROOT_PATH$$MSYS_MINGW_PATH