Revert "Fix compiling of 32 bit binary on 64-bit Windows"
[stockfish] / src / Makefile
index 397b404..4e4d3d9 100644 (file)
@@ -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
 
 ### ==========================================================================
@@ -141,6 +141,7 @@ endif
 ### 3.1 Selecting compiler (default = gcc)
 
 CXXFLAGS += -Wall -Wcast-qual -fno-exceptions -fno-rtti -std=c++11 $(EXTRACXXFLAGS)
+DEPENDFLAGS += -std=c++11
 LDFLAGS += $(EXTRALDFLAGS)
 
 ifeq ($(COMP),)
@@ -150,15 +151,35 @@ endif
 ifeq ($(COMP),gcc)
        comp=gcc
        CXX=g++
-       CXXFLAGS += -pedantic -Wno-long-long -Wextra -Wshadow
-       LDFLAGS += -Wl,--no-as-needed
+       CXXFLAGS += -pedantic -Wextra -Wshadow
+       ifneq ($(UNAME),Darwin)
+          LDFLAGS += -Wl,--no-as-needed
+       endif
 endif
 
 ifeq ($(COMP),mingw)
        comp=mingw
-       CXX=g++
+
+       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-libstdc++ -static-libgcc
+       LDFLAGS += -static
 endif
 
 ifeq ($(COMP),icc)
@@ -170,7 +191,11 @@ 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++
+       endif
 endif
 
 ifeq ($(comp),icc)
@@ -186,8 +211,13 @@ else
 endif
 
 ifeq ($(UNAME),Darwin)
-       CXXFLAGS += -arch $(arch) -mmacosx-version-min=10.6
-       LDFLAGS += -arch $(arch) -mmacosx-version-min=10.6
+       CXXFLAGS += -arch $(arch) -mmacosx-version-min=10.9
+       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
@@ -295,18 +325,25 @@ 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)
        ifeq ($(optimize),yes)
        ifeq ($(debug),no)
-               GCC_MAJOR := `$(CXX) -dumpversion | cut -f1 -d.`
-               GCC_MINOR := `$(CXX) -dumpversion | cut -f2 -d.`
-               ifeq (1,$(shell expr \( $(GCC_MAJOR) \> 4 \) \| \( $(GCC_MAJOR) \= 4 \& $(GCC_MINOR) \>= 5 \)))
-                       CXXFLAGS += -flto
-                       LDFLAGS += $(CXXFLAGS)
-               endif
+               CXXFLAGS += -flto
+               LDFLAGS += $(CXXFLAGS)
+       endif
+       endif
+endif
+
+ifeq ($(comp),mingw)
+       ifeq ($(UNAME),Linux)
+       ifeq ($(optimize),yes)
+       ifeq ($(debug),no)
+               CXXFLAGS += -flto
+               LDFLAGS += $(CXXFLAGS)
+       endif
        endif
        endif
 endif
@@ -379,7 +416,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