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

diff --git a/src/Makefile b/src/Makefile
index ee09dc7b..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
@@ -160,18 +161,22 @@ endif
 ifeq ($(COMP),mingw)
 	comp=mingw
 
-	ifeq ($(bits),64)
-		ifeq ($(shell which x86_64-w64-mingw32-c++-posix),)
-			CXX=x86_64-w64-mingw32-c++
+	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
-			CXX=x86_64-w64-mingw32-c++-posix
+			ifeq ($(shell which i686-w64-mingw32-c++-posix),)
+				CXX=i686-w64-mingw32-c++
+			else
+				CXX=i686-w64-mingw32-c++-posix
+			endif
 		endif
 	else
-		ifeq ($(shell which i686-w64-mingw32-c++-posix),)
-			CXX=i686-w64-mingw32-c++
-		else
-			CXX=i686-w64-mingw32-c++-posix
-		endif
+		CXX=g++
 	endif
 
 	CXXFLAGS += -Wextra -Wshadow