X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2FMakefile;h=9b8e926a5c73df6d9f283d638eb43824bd7b19a4;hp=291775a94f4b136df0bfd6e63d214af72574c97c;hb=cc3002ff0450e4f396cd95c0dcbf44bb66dab695;hpb=e460ab74adc0259441c33eb3eb08826d69fee4af

diff --git a/src/Makefile b/src/Makefile
index 291775a9..9b8e926a 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-2013 Marco Costalba, Joona Kiiski, Tord Romstad
+# Copyright (C) 2008-2014 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
@@ -69,7 +69,6 @@ OBJS = benchmark.o bitbase.o bitboard.o book.o endgame.o evaluate.o main.o \
 debug = no
 optimize = yes
 
-arch = any
 os = any
 bits = 32
 prefetch = no
@@ -79,18 +78,22 @@ sse = no
 
 ### 2.2 Architecture specific
 
+ifeq ($(ARCH),general-32)
+	arch = any
+endif
+
 ifeq ($(ARCH),x86-32-old)
 	arch = i386
 endif
 
 ifeq ($(ARCH),x86-32)
 	arch = i386
-	bits = 32
 	prefetch = yes
 	sse = yes
 endif
 
 ifeq ($(ARCH),general-64)
+	arch = any
 	bits = 64
 endif
 
@@ -113,7 +116,6 @@ endif
 
 ifeq ($(ARCH),armv7)
 	arch = armv7
-	bits = 32
 	prefetch = yes
 	bsfq = yes
 endif
@@ -121,7 +123,6 @@ endif
 ifeq ($(ARCH),osx-ppc-32)
 	arch = ppc
 	os = osx
-	bits = 32
 endif
 
 ifeq ($(ARCH),osx-ppc-64)
@@ -157,7 +158,6 @@ endif
 ifeq ($(ARCH),osx-x86-32)
 	arch = i386
 	os = osx
-	bits = 32
 	prefetch = yes
 	bsfq = no
 	popcnt = no
@@ -170,28 +170,37 @@ endif
 ### ==========================================================================
 
 ### 3.1 Selecting compiler (default = gcc)
+
+CXXFLAGS += -Wall -Wcast-qual -fno-exceptions -fno-rtti $(EXTRACXXFLAGS)
+LDFLAGS += $(EXTRALDFLAGS)
+
 ifeq ($(COMP),)
 	COMP=gcc
 endif
 
-ifeq ($(COMP),mingw)
-	comp=mingw
+ifeq ($(COMP),gcc)
+	comp=gcc
 	CXX=g++
+	CXXFLAGS += -ansi -pedantic -Wno-long-long -Wextra -Wshadow
 endif
 
-ifeq ($(COMP),gcc)
-	comp=gcc
+ifeq ($(COMP),mingw)
+	comp=mingw
 	CXX=g++
+	CXXFLAGS += -Wextra -Wshadow
+	LDFLAGS += -static-libstdc++ -static-libgcc
 endif
 
 ifeq ($(COMP),icc)
 	comp=icc
 	CXX=icpc
+	CXXFLAGS += -diag-disable 1476,10120 -Wcheck -Wabi -Wdeprecated -strict-ansi
 endif
 
 ifeq ($(COMP),clang)
 	comp=clang
 	CXX=clang++
+	CXXFLAGS += -ansi -pedantic -Wno-long-long -Wextra -Wshadow
 endif
 
 ifeq ($(comp),icc)
@@ -206,27 +215,6 @@ else
 	profile_clean = gcc-profile-clean
 endif
 
-### 3.2 General compiler and linker settings
-CXXFLAGS = -Wall -Wcast-qual -fno-exceptions -fno-rtti $(EXTRACXXFLAGS)
-LDFLAGS += $(EXTRALDFLAGS)
-
-ifeq ($(comp),gcc)
-	CXXFLAGS += -ansi -pedantic -Wno-long-long -Wextra -Wshadow
-endif
-
-ifeq ($(comp),mingw)
-	CXXFLAGS += -Wextra -Wshadow
-	LDFLAGS += -static-libstdc++ -static-libgcc
-endif
-
-ifeq ($(comp),icc)
-	CXXFLAGS += -diag-disable 1476,10120 -Wcheck -Wabi -Wdeprecated -strict-ansi
-endif
-
-ifeq ($(comp),clang)
-	CXXFLAGS += -ansi -pedantic -Wno-long-long -Wextra -Wshadow
-endif
-
 ifeq ($(os),osx)
 	CXXFLAGS += -arch $(arch) -mmacosx-version-min=10.6
 	LDFLAGS += -arch $(arch) -mmacosx-version-min=10.6