From: braich <braichuk@tut.by>
Date: Sat, 19 Dec 2015 20:39:41 +0000 (+0300)
Subject: Fix compiling of 32 bit binary on 64-bit Windows
X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=1e8836d921b3b508e5d44d2fafab95230bdd03c6

Fix compiling of 32 bit binary on 64-bit Windows

Two versions of mingw-w64 (targeting Win64 and Win32)
can be installed on Windows too.

No functional change

Resolves #532
---

diff --git a/src/Makefile b/src/Makefile
index 4e4d3d91..ee09dc7b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -160,22 +160,18 @@ endif
 ifeq ($(COMP),mingw)
 	comp=mingw
 
-	ifeq ($(UNAME),Linux)
-		ifeq ($(bits),64)
-			ifeq ($(shell which x86_64-w64-mingw32-c++-posix),)
-				CXX=x86_64-w64-mingw32-c++
-			else
-				CXX=x86_64-w64-mingw32-c++-posix
-			endif
+	ifeq ($(bits),64)
+		ifeq ($(shell which x86_64-w64-mingw32-c++-posix),)
+			CXX=x86_64-w64-mingw32-c++
 		else
-			ifeq ($(shell which i686-w64-mingw32-c++-posix),)
-				CXX=i686-w64-mingw32-c++
-			else
-				CXX=i686-w64-mingw32-c++-posix
-			endif
+			CXX=x86_64-w64-mingw32-c++-posix
 		endif
 	else
-		CXX=g++
+		ifeq ($(shell which i686-w64-mingw32-c++-posix),)
+			CXX=i686-w64-mingw32-c++
+		else
+			CXX=i686-w64-mingw32-c++-posix
+		endif
 	endif
 
 	CXXFLAGS += -Wextra -Wshadow