Fix compiling of 32 bit binary on 64-bit Windows

[stockfish] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 65ef297ee837bc3c37566e8e2f33ddb3f212e92c..ee09dc7b63fdb7f19b43fd621b79ee06e4930c00 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -35,7 +35,7 @@ PGOBENCH = ./$(EXE) bench 16 1 1000 default time
 
 ### Object files
 OBJS = benchmark.o bitbase.o bitboard.o endgame.o evaluate.o main.o \
-       material.o misc.o movegen.o movepick.o pawns.o position.o \
+       material.o misc.o movegen.o movepick.o pawns.o position.o psqt.o \
        search.o thread.o timeman.o tt.o uci.o ucioption.o syzygy/tbprobe.o
 
 ### ==========================================================================
@@ -151,17 +151,29 @@ endif
 ifeq ($(COMP),gcc)
        comp=gcc
        CXX=g++
-       CXXFLAGS += -pedantic -Wno-long-long -Wextra -Wshadow
+       CXXFLAGS += -pedantic -Wextra -Wshadow
        ifneq ($(UNAME),Darwin)
           LDFLAGS += -Wl,--no-as-needed
-       else
-          LDFLAGS += -Wl
        endif
 endif
 
 ifeq ($(COMP),mingw)
        comp=mingw
-       CXX=g++
+
+       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
@@ -175,7 +187,7 @@ endif
 ifeq ($(COMP),clang)
        comp=clang
        CXX=clang++
-       CXXFLAGS += -pedantic -Wno-long-long -Wextra -Wshadow
+       CXXFLAGS += -pedantic -Wextra -Wshadow
        ifeq ($(UNAME),Darwin)
                CXXFLAGS += -std=c++0x -stdlib=libc++
                DEPENDFLAGS += -std=c++0x -stdlib=libc++
@@ -199,6 +211,11 @@ ifeq ($(UNAME),Darwin)
        LDFLAGS += -arch $(arch) -mmacosx-version-min=10.9
 endif
 
+### Travis CI script uses COMPILER to overwrite CXX
+ifdef COMPILER
+       CXX=$(COMPILER)
+endif
+
 ### On mingw use Windows threads, otherwise POSIX
 ifneq ($(comp),mingw)
        # On Android Bionic's C library comes with its own pthread implementation bundled in
@@ -304,7 +321,7 @@ ifeq ($(pext),yes)
        endif
 endif
 
-### 3.11 Link Time Optimization, it works since gcc 4.5 but not on mingw.
+### 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)
@@ -316,6 +333,17 @@ ifeq ($(comp),gcc)
        endif
 endif
 
+ifeq ($(comp),mingw)
+       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
 ### breaks Android 4.0 and earlier.
 ifeq ($(arch),armv7)
@@ -384,7 +412,7 @@ profile-build:
        $(MAKE) ARCH=$(ARCH) COMP=$(COMP) $(profile_make)
        @echo ""
        @echo "Step 2/4. Running benchmark for pgo-build ..."
-       @$(PGOBENCH) > /dev/null
+       $(PGOBENCH) > /dev/null
        @echo ""
        @echo "Step 3/4. Building final executable ..."
        @touch *.cpp *.h syzygy/*.cpp syzygy/*.h