From e162bf3c3d7e8a46e228dc07932f67b9da81a9fe Mon Sep 17 00:00:00 2001
From: Anton Kochkov <xvilka@gmail.com>
Date: Tue, 21 Nov 2017 12:50:27 +0800
Subject: [PATCH] Slight Mingw32 building fixes

---
 sys/mingw32.bat | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/sys/mingw32.bat b/sys/mingw32.bat
index 4712edc627..31597e600e 100644
--- a/sys/mingw32.bat
+++ b/sys/mingw32.bat
@@ -16,13 +16,18 @@ set "MINGW_BIN_PATH=%MINGW_PATH%\bin"
 rem -----------------------------------------------------------------------------------
 
 if not [%GIT_PATH%] NEQ [] (
-	set "GIT_PATH=C:\Program Files (x86)\Git"
+	rem Prefer 64 bit version of installed Git
+	if not exist "C:\Program Files\Git\nul" (
+		set "GIT_PATH=C:\Program Files (x86)\Git"
+	) else (
+		set "GIT_PATH=C:\Program Files\Git"
+	)
 )
 set "GIT_BIN_PATH=%GIT_PATH%\bin"
 
 rem -----------------------------------------------------------------------------------
 
-SET PATH=%MINGW_BIN_PATH%;%GIT_BIN_PATH%;%PATH%
+SET PATH=%MINGW_BIN_PATH%;%GIT_BIN_PATH%;%MINGW_MSYS_PATH%;%PATH%
 
 echo Using PATH = %PATH% ...