X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2FMakefile;h=4e4d3d918539f73d0df51e41b77dde2b1188bfc1;hp=f183e4e3d2e3902ac52e4ed5b0b8ade7daab6a44;hb=90f5937373974adf4ae7216feedf5abc4d62debd;hpb=c6d45c60b516e799526f1163733b74b23fc1b63c diff --git a/src/Makefile b/src/Makefile index f183e4e3..4e4d3d91 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,6 +1,6 @@ # Stockfish, a UCI chess playing engine derived from Glaurung 2.1 # Copyright (C) 2004-2008 Tord Romstad (Glaurung author) -# Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad +# Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, 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 @@ -28,19 +28,15 @@ EXE = stockfish ### Installation dir definitions PREFIX = /usr/local -# Haiku has a non-standard filesystem layout -ifeq ($(UNAME),Haiku) - PREFIX=/boot/system/non-packaged -endif BINDIR = $(PREFIX)/bin ### Built-in benchmark for pgo-builds -PGOBENCH = ./$(EXE) bench 16 1 1 default time +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 \ - search.o thread.o timeman.o tt.o uci.o ucioption.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 ### ========================================================================== ### Section 2. High-level Configuration @@ -52,7 +48,6 @@ OBJS = benchmark.o bitbase.o bitboard.o endgame.o evaluate.o main.o \ # debug = yes/no --- -DNDEBUG --- Enable/Disable debug mode # optimize = yes/no --- (-O3/-fast etc.) --- Enable/Disable optimizations # arch = (name) --- (-arch) --- Target architecture -# os = (name) --- --- Target operating system # bits = 64/32 --- -DIS_64BIT --- 64-/32-bit operating system # prefetch = yes/no --- -DUSE_PREFETCH --- Use prefetch x86 asm-instruction # bsfq = yes/no --- -DUSE_BSFQ --- Use bsfq x86_64 asm-instruction (only @@ -68,7 +63,6 @@ OBJS = benchmark.o bitbase.o bitboard.o endgame.o evaluate.o main.o \ ### 2.1. General and architecture defaults optimize = yes debug = no -os = any bits = 32 prefetch = no bsfq = no @@ -146,7 +140,8 @@ endif ### 3.1 Selecting compiler (default = gcc) -CXXFLAGS += -Wall -Wcast-qual -fno-exceptions -fno-rtti $(EXTRACXXFLAGS) +CXXFLAGS += -Wall -Wcast-qual -fno-exceptions -fno-rtti -std=c++11 $(EXTRACXXFLAGS) +DEPENDFLAGS += -std=c++11 LDFLAGS += $(EXTRALDFLAGS) ifeq ($(COMP),) @@ -156,14 +151,35 @@ endif ifeq ($(COMP),gcc) comp=gcc CXX=g++ - CXXFLAGS += -ansi -pedantic -Wno-long-long -Wextra -Wshadow + 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) @@ -175,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) @@ -191,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 @@ -300,22 +325,37 @@ 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 + +### 3.12 Android 5 can only run position independent executables. Note that this +### breaks Android 4.0 and earlier. +ifeq ($(arch),armv7) + CXXFLAGS += -fPIE + LDFLAGS += -fPIE -pie +endif + + ### ========================================================================== ### Section 4. Public targets ### ========================================================================== @@ -354,10 +394,6 @@ help: @echo "clang > LLVM Clang compiler" @echo "icc > Intel compiler" @echo "" - @echo "Non-standard targets:" - @echo "" - @echo "make hpux > Compile for HP-UX. Compiler = aCC" - @echo "" @echo "Examples. If you don't know what to do, you likely want to run: " @echo "" @echo "make build ARCH=x86-64 (This is for 64-bit systems)" @@ -376,14 +412,14 @@ profile-build: $(MAKE) ARCH=$(ARCH) COMP=$(COMP) $(profile_prepare) @echo "" @echo "Step 1/4. Building executable for benchmark ..." - @touch *.cpp *.h + @touch *.cpp *.h syzygy/*.cpp syzygy/*.h $(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 + @touch *.cpp *.h syzygy/*.cpp syzygy/*.h $(MAKE) ARCH=$(ARCH) COMP=$(COMP) $(profile_use) @echo "" @echo "Step 4/4. Deleting profile data ..." @@ -398,7 +434,7 @@ install: -strip $(BINDIR)/$(EXE) clean: - $(RM) $(EXE) $(EXE).exe *.o .depend *~ core bench.txt *.gcda + $(RM) $(EXE) $(EXE).exe *.o .depend *~ core bench.txt *.gcda ./syzygy/*.o ./syzygy/*.gcda default: help @@ -415,7 +451,6 @@ config-sanity: @echo "debug: '$(debug)'" @echo "optimize: '$(optimize)'" @echo "arch: '$(arch)'" - @echo "os: '$(os)'" @echo "bits: '$(bits)'" @echo "prefetch: '$(prefetch)'" @echo "bsfq: '$(bsfq)'" @@ -434,7 +469,6 @@ config-sanity: @test "$(optimize)" = "yes" || test "$(optimize)" = "no" @test "$(arch)" = "any" || test "$(arch)" = "x86_64" || test "$(arch)" = "i386" || \ test "$(arch)" = "ppc64" || test "$(arch)" = "ppc" || test "$(arch)" = "armv7" - @test "$(os)" = "any" @test "$(bits)" = "32" || test "$(bits)" = "64" @test "$(prefetch)" = "yes" || test "$(prefetch)" = "no" @test "$(bsfq)" = "yes" || test "$(bsfq)" = "no" @@ -457,12 +491,12 @@ gcc-profile-make: gcc-profile-use: $(MAKE) ARCH=$(ARCH) COMP=$(COMP) \ - EXTRACXXFLAGS='-fprofile-use' \ + EXTRACXXFLAGS='-fprofile-use -fno-peel-loops -fno-tracer' \ EXTRALDFLAGS='-lgcov' \ all gcc-profile-clean: - @rm -rf *.gcda *.gcno bench.txt + @rm -rf *.gcda *.gcno syzygy/*.gcda syzygy/*.gcno bench.txt icc-profile-prepare: $(MAKE) ARCH=$(ARCH) COMP=$(COMP) icc-profile-clean @@ -486,15 +520,3 @@ icc-profile-clean: -include .depend - -### ========================================================================== -### Section 6. Non-standard targets -### ========================================================================== - -hpux: - $(MAKE) \ - CXX='/opt/aCC/bin/aCC -AA +hpxstd98 -mt +O3 -DNDEBUG -DNO_PREFETCH' \ - CXXFLAGS="" \ - LDFLAGS="" \ - all -