Fix compiling of 32 bit binary on 64-bit Windows

[stockfish] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index a95f13b3f5b00ed1007f65edc6f0a3f73bf522ae..ee09dc7b63fdb7f19b43fd621b79ee06e4930c00 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -159,11 +159,21 @@ endif
 
 ifeq ($(COMP),mingw)
        comp=mingw
-        ifeq ($(UNAME),Linux)
-            CXX=x86_64-w64-mingw32-g++-posix
-        else
-           CXX=g++
-        endif
+
+       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
+
        CXXFLAGS += -Wextra -Wshadow
        LDFLAGS += -static
 endif
@@ -311,7 +321,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 +333,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