X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2FMakefile;h=7ddb643c11710713b2b782d4a4dfc8203577c928;hp=c73b94f390a177bd1dd0b65c9d43f39cb5b42e32;hb=ddcb572c41d660f7ed2baa8c21fb56dec0bc7a7c;hpb=4e7da9be3dcb2d58d59da7b3d421a1ff20f040a9 diff --git a/src/Makefile b/src/Makefile index c73b94f3..7ddb643c 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-2012 Marco Costalba, Joona Kiiski, Tord Romstad +# Copyright (C) 2008-2013 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 @@ -58,6 +58,7 @@ OBJS = benchmark.o bitbase.o bitboard.o book.o endgame.o evaluate.o main.o \ # bsfq = yes/no --- -DUSE_BSFQ --- Use bsfq x86_64 asm-instruction (only # with GCC and ICC 64-bit) # popcnt = yes/no --- -DUSE_POPCNT --- Use popcnt x86_64 asm-instruction +# sse = yes/no --- -msse --- Use Intel Streaming SIMD Extensions # # Note that Makefile is space sensitive, so when adding new architectures # or modifying existing flags, you have to make sure there are no extra spaces @@ -77,6 +78,7 @@ ifeq ($(ARCH),general-64) prefetch = no bsfq = no popcnt = no + sse = no endif ifeq ($(ARCH),general-32) @@ -86,6 +88,7 @@ ifeq ($(ARCH),general-32) prefetch = no bsfq = no popcnt = no + sse = no endif # x86-section @@ -96,6 +99,7 @@ ifeq ($(ARCH),x86-64) prefetch = yes bsfq = yes popcnt = no + sse = yes endif ifeq ($(ARCH),x86-64-modern) @@ -105,6 +109,7 @@ ifeq ($(ARCH),x86-64-modern) prefetch = yes bsfq = yes popcnt = yes + sse = yes endif ifeq ($(ARCH),x86-32) @@ -114,6 +119,7 @@ ifeq ($(ARCH),x86-32) prefetch = yes bsfq = no popcnt = no + sse = yes endif ifeq ($(ARCH),x86-32-old) @@ -123,16 +129,18 @@ ifeq ($(ARCH),x86-32-old) prefetch = no bsfq = no popcnt = no + sse = no endif #arm section -ifeq ($(ARCH),arm-32) - arch = arm-32 +ifeq ($(ARCH),armv7) + arch = armv7 os = any bits = 32 prefetch = yes - bsfq = no + bsfq = yes popcnt = no + sse = no endif # osx-section @@ -143,6 +151,7 @@ ifeq ($(ARCH),osx-ppc-64) prefetch = no bsfq = no popcnt = no + sse = no endif ifeq ($(ARCH),osx-ppc-32) @@ -152,6 +161,7 @@ ifeq ($(ARCH),osx-ppc-32) prefetch = no bsfq = no popcnt = no + sse = no endif ifeq ($(ARCH),osx-x86-64) @@ -161,6 +171,7 @@ ifeq ($(ARCH),osx-x86-64) prefetch = yes bsfq = yes popcnt = no + sse = yes endif ifeq ($(ARCH),osx-x86-32) @@ -170,6 +181,7 @@ ifeq ($(ARCH),osx-x86-32) prefetch = yes bsfq = no popcnt = no + sse = yes endif @@ -219,7 +231,7 @@ ifeq ($(COMP),clang) endif ### 3.2 General compiler settings -CXXFLAGS = -g -Wall -Wcast-qual -fno-exceptions -fno-rtti $(EXTRACXXFLAGS) +CXXFLAGS = -Wall -Wcast-qual -fno-exceptions -fno-rtti $(EXTRACXXFLAGS) ifeq ($(comp),gcc) CXXFLAGS += -ansi -pedantic -Wno-long-long -Wextra -Wshadow @@ -230,7 +242,7 @@ ifeq ($(comp),mingw) endif ifeq ($(comp),icc) - CXXFLAGS += -wd383,981,1418,1419,10187,10188,11505,11503 -Wcheck -Wabi -Wdeprecated -strict-ansi + CXXFLAGS += -wd383,981,1418,1419,1476,10187,10188,11505,11503 -Wcheck -Wabi -Wdeprecated -strict-ansi endif ifeq ($(comp),clang) @@ -238,12 +250,16 @@ ifeq ($(comp),clang) endif ifeq ($(os),osx) - CXXFLAGS += -arch $(arch) -mmacosx-version-min=10.6 + CXXFLAGS += -arch $(arch) -mmacosx-version-min=10.0 endif ### 3.3 General linker settings LDFLAGS = $(EXTRALDFLAGS) +ifeq ($(comp),mingw) + LDFLAGS += -static-libstdc++ -static-libgcc +endif + ### On mingw use Windows threads, otherwise POSIX ifneq ($(comp),mingw) # Haiku has pthreads in its libroot, so only link it in on other platforms @@ -253,12 +269,14 @@ ifneq ($(comp),mingw) endif ifeq ($(os),osx) - LDFLAGS += -arch $(arch) -mmacosx-version-min=10.6 + LDFLAGS += -arch $(arch) -mmacosx-version-min=10.0 endif ### 3.4 Debugging ifeq ($(debug),no) CXXFLAGS += -DNDEBUG +else + CXXFLAGS += -g endif ### 3.5 Optimization @@ -276,7 +294,7 @@ ifeq ($(optimize),yes) endif endif - ifeq ($(arch),arm-32) + ifeq ($(arch),armv7) CXXFLAGS += -fno-gcse endif endif @@ -315,7 +333,7 @@ endif ### 3.7 prefetch ifeq ($(prefetch),yes) - ifneq ($(arch),arm-32) + ifeq ($(sse),yes) CXXFLAGS += -msse DEPENDFLAGS += -msse endif @@ -338,6 +356,7 @@ endif ### 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 \))) @@ -345,6 +364,7 @@ ifeq ($(comp),gcc) LDFLAGS += $(CXXFLAGS) endif endif + endif endif ### ========================================================================== @@ -376,7 +396,7 @@ help: @echo "osx-ppc-32 > PPC-Mac OS X 32 bit" @echo "osx-x86-64 > x86-Mac OS X 64 bit" @echo "osx-x86-32 > x86-Mac OS X 32 bit" - @echo "arm-32 > ARM 32 bit" + @echo "armv7 > ARMv7 32 bit" @echo "general-64 > unspecified 64-bit" @echo "general-32 > unspecified 32-bit" @echo "" @@ -455,6 +475,7 @@ config-sanity: @echo "prefetch: '$(prefetch)'" @echo "bsfq: '$(bsfq)'" @echo "popcnt: '$(popcnt)'" + @echo "sse: '$(sse)'" @echo "" @echo "Flags:" @echo "CXX: $(CXX)" @@ -466,12 +487,13 @@ config-sanity: @test "$(debug)" = "yes" || test "$(debug)" = "no" @test "$(optimize)" = "yes" || test "$(optimize)" = "no" @test "$(arch)" = "any" || test "$(arch)" = "x86_64" || test "$(arch)" = "i386" || \ - test "$(arch)" = "ppc64" || test "$(arch)" = "ppc" || test "$(arch)" = "arm-32" + test "$(arch)" = "ppc64" || test "$(arch)" = "ppc" || test "$(arch)" = "armv7" @test "$(os)" = "any" || test "$(os)" = "osx" @test "$(bits)" = "32" || test "$(bits)" = "64" @test "$(prefetch)" = "yes" || test "$(prefetch)" = "no" @test "$(bsfq)" = "yes" || test "$(bsfq)" = "no" @test "$(popcnt)" = "yes" || test "$(popcnt)" = "no" + @test "$(sse)" = "yes" || test "$(sse)" = "no" @test "$(comp)" = "gcc" || test "$(comp)" = "icc" || test "$(comp)" = "mingw" || test "$(comp)" = "clang" $(EXE): $(OBJS)