Fix TT comment and static_assert()

[stockfish] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 9d18344f44a4a78f08f1a0368128c26c9f83d347..29b784e5fe4aaad867b64ac0ed8aa4c779c1f6d8 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
 
 ### ==========================================================================
@@ -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,11 +151,9 @@ 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
 
@@ -162,7 +161,7 @@ ifeq ($(COMP),mingw)
        comp=mingw
        CXX=g++
        CXXFLAGS += -Wextra -Wshadow
-       LDFLAGS += -static-libstdc++ -static-libgcc
+       LDFLAGS += -static
 endif
 
 ifeq ($(COMP),icc)
@@ -174,9 +173,10 @@ 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
 
@@ -197,6 +197,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
@@ -382,7 +387,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