X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2FMakefile;h=d2d95f3974154648c4e00e8a940c469d0dd0aed3;hp=a95f13b3f5b00ed1007f65edc6f0a3f73bf522ae;hb=9eceb894ac91b9b4a88d1972778705304666ac33;hpb=388630ae285b3f9f0c8ee4f30e754bde6688c57c

diff --git a/src/Makefile b/src/Makefile
index a95f13b3..d2d95f39 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,7 @@
 # Stockfish, a UCI chess playing engine derived from Glaurung 2.1
 # Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
 # Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+# Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
 #
 # Stockfish is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -159,11 +160,25 @@ endif
 
 ifeq ($(COMP),mingw)
 	comp=mingw
-        ifeq ($(UNAME),Linux)
-            CXX=x86_64-w64-mingw32-g++-posix
-        else
-	    CXX=g++
-        endif
+
+	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
+		else
+			ifeq ($(shell which i686-w64-mingw32-c++-posix),)
+				CXX=i686-w64-mingw32-c++
+			else
+				CXX=i686-w64-mingw32-c++-posix
+			endif
+		endif
+	else
+		CXX=g++
+	endif
+
 	CXXFLAGS += -Wextra -Wshadow
 	LDFLAGS += -static
 endif
@@ -311,7 +326,7 @@ ifeq ($(pext),yes)
 	endif
 endif
 
-### 3.11 Link Time Optimization, it works since gcc 4.5 but not on mingw under windows.
+### 3.11 Link Time Optimization, it works since gcc 4.5 but not on mingw under Windows.
 ### This is a mix of compile and link time options because the lto link phase
 ### needs access to the optimization flags.
 ifeq ($(comp),gcc)
@@ -323,15 +338,15 @@ ifeq ($(comp),gcc)
 	endif
 endif
 
-ifeq ($(UNAME),Linux)
 ifeq ($(comp),mingw)
-        ifeq ($(optimize),yes)
-        ifeq ($(debug),no)
-                CXXFLAGS += -flto
-                LDFLAGS += $(CXXFLAGS)
-        endif
-        endif
-endif
+	ifeq ($(UNAME),Linux)
+	ifeq ($(optimize),yes)
+	ifeq ($(debug),no)
+		CXXFLAGS += -flto
+		LDFLAGS += $(CXXFLAGS)
+	endif
+	endif
+	endif
 endif
 
 ### 3.12 Android 5 can only run position independent executables. Note that this