1.1 --- a/make/common/shared/Compiler-msvc.gmk Thu Oct 02 19:58:15 2008 -0700
1.2 +++ b/make/common/shared/Compiler-msvc.gmk Wed Oct 15 21:24:26 2008 -0700
1.3 @@ -47,24 +47,17 @@
1.4 # unset any GNU Make settings of MFLAGS and MAKEFLAGS which may mess up nmake
1.5 NMAKE = MFLAGS= MAKEFLAGS= $(COMPILER_PATH)nmake -nologo
1.6
1.7 + # Compiler version and type (Always get word after "Version")
1.8 + CC_VER := $(shell $(CC) 2>&1 | $(HEAD) -n 1 | $(SED) 's/.*\(Version.*\)/\1/' | $(NAWK) '{print $$2}')
1.9 +
1.10 # SDK-64 and MSVC6 put REBASE.EXE in a different places - go figure...
1.11 ifeq ($(ARCH_DATA_MODEL), 32)
1.12 - CC_VER := $(shell $(CC) 2>&1 | $(HEAD) -n 1 | $(NAWK) '{print $$8}')
1.13 LINK_VER := $(shell $(LINK) | $(HEAD) -n 1 | $(NAWK) '{print $$6}')
1.14 - CC_TYPE := $(shell $(CC) 2>&1 | $(HEAD) -n 1 | $(NAWK) '{print $$5}')
1.15 CC_MAJORVER :=$(call MajorVersion,$(CC_VER))
1.16 - REQUIRED_CCTYPE = Optimizing
1.17 - REQUIRED_CC_VER = 13.10.3077
1.18 - REQUIRED_LINK_VER = 7.10.3077
1.19 - ifeq ($(CC_MAJORVER), 12)
1.20 - # This should be: CC_VER=12.00.8168 LINK_VER=6.00.8447
1.21 - COMPILER_NAME=Visual C++ 6.0 Professional + VC6-SP 3
1.22 - COMPILER_VERSION=VC6
1.23 - REBASE = $(COMPILER_PATH)rebase
1.24 - MTL = $(COMPILER_PATH)midl
1.25 - endif
1.26 ifeq ($(CC_MAJORVER), 13)
1.27 # This should be: CC_VER=13.10.3077 LINK_VER=7.10.3077
1.28 + REQUIRED_CC_VER = 13.10.3077
1.29 + REQUIRED_LINK_VER = 7.10.3077
1.30 COMPILER_NAME=Visual Studio .NET 2003 Professional C++
1.31 COMPILER_VERSION=VS2003
1.32 REBASE = $(COMPILER_PATH)../../Common7/Tools/Bin/rebase
1.33 @@ -74,9 +67,10 @@
1.34 endif
1.35 endif
1.36 ifeq ($(CC_MAJORVER), 14)
1.37 - # This should be: CC_VER=14.00.0000 LINK_VER=8.00.0000
1.38 - # NOTE: This compiler has not been tried yet on 32bit systems
1.39 - COMPILER_NAME=Visual Studio .NET 2005
1.40 + # This should be: CC_VER=14.00.50727.42 LINK_VER=8.00.50727.42
1.41 + REQUIRED_CC_VER = 14.00.50727.42
1.42 + REQUIRED_LINK_VER = 8.00.50727.42
1.43 + COMPILER_NAME=Visual Studio 8
1.44 COMPILER_VERSION=VS2005
1.45 REBASE = $(COMPILER_PATH)../../Common8/Tools/Bin/rebase
1.46 MTL = $(COMPILER_PATH)../../Common8/Tools/Bin/midl
1.47 @@ -84,10 +78,22 @@
1.48 COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
1.49 endif
1.50 endif
1.51 + ifeq ($(CC_MAJORVER), 15)
1.52 + # This should be: CC_VER=15.00.21022.08 LINK_VER=9.00.21022.08
1.53 + REQUIRED_CC_VER = 15.00.21022.08
1.54 + REQUIRED_LINK_VER = 9.00.21022.08
1.55 + COMPILER_NAME=Visual Studio 9
1.56 + COMPILER_VERSION=VS2008
1.57 + #rebase and midl moved out of Visual Studio into the SDK:
1.58 + REBASE = $(MSDEVTOOLS_PATH)/rebase
1.59 + MTL = $(MSDEVTOOLS_PATH)/midl.exe
1.60 + ifndef COMPILER_PATH
1.61 + COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
1.62 + endif
1.63 + endif
1.64 else
1.65 - CC_VER := $(shell $(CC) 2>&1 | $(HEAD) -n 1 | $(NAWK) '{print $$7}')
1.66 + # else ARCH_DATA_MODEL is 64
1.67 LINK_VER := $(shell $(LINK) | $(HEAD) -n 1 | $(NAWK) '{print $$6}')
1.68 - CC_TYPE := $(shell $(CC) 2>&1 | $(HEAD) -n 1 | $(NAWK) '{print $$4}')
1.69 CC_MAJORVER :=$(call MajorVersion,$(CC_VER))
1.70 CC_MINORVER :=$(call MinorVersion,$(CC_VER))
1.71 CC_MICROVER :=$(call MicroVersion,$(CC_VER))
