1.1 --- a/make/common/shared/Compiler-msvc.gmk Thu Apr 29 14:32:40 2010 -0700
1.2 +++ b/make/common/shared/Compiler-msvc.gmk Tue May 11 14:35:21 2010 -0700
1.3 @@ -97,6 +97,19 @@
1.4 COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
1.5 endif
1.6 endif
1.7 + ifeq ($(CC_MAJORVER), 16)
1.8 + # This should be: CC_VER=16.00.30319.01 LINK_VER=10.00.30319.01
1.9 + REQUIRED_CC_VER = 16.00.30319.01
1.10 + REQUIRED_LINK_VER = 10.00.30319.01
1.11 + COMPILER_NAME=Visual Studio 10
1.12 + COMPILER_VERSION=VS2010
1.13 + #rebase and midl moved out of Visual Studio into the SDK:
1.14 + REBASE = $(MSDEVTOOLS_PATH)/rebase
1.15 + MTL = $(MSDEVTOOLS_PATH)/midl.exe
1.16 + ifndef COMPILER_PATH
1.17 + COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
1.18 + endif
1.19 + endif
1.20 else
1.21 # else ARCH_DATA_MODEL is 64
1.22 ifndef LINK_VER
1.23 @@ -144,11 +157,21 @@
1.24 COMPILER_NAME=Windows SDK 6.1 Visual Studio 9
1.25 COMPILER_VERSION=VS2008
1.26 RC = $(MSSDK61)/bin/x64/rc
1.27 - REBASE = $(MSSDK61/bin/x64/rebase
1.28 + REBASE = $(MSSDK61)/bin/x64/rebase
1.29 else
1.30 - # This will cause problems if ALT_COMPILER_PATH is defined to ""
1.31 - # which is a directive to use the PATH.
1.32 - REBASE = $(COMPILER_PATH)../REBASE
1.33 + ifeq ($(CC_MAJORVER), 16)
1.34 + # This should be: CC_VER=16.00.30319.01 LINK_VER=9.00.30319.01
1.35 + REQUIRED_CC_VER = 16.00.30319.01
1.36 + REQUIRED_LINK_VER = 10.00.30319.01
1.37 + COMPILER_NAME=Microsoft Visual Studio 10
1.38 + COMPILER_VERSION=VS2010
1.39 + RC = $(MSSDK7)/bin/x64/rc
1.40 + REBASE = $(MSSDK7)/bin/x64/rebase
1.41 + else
1.42 + # This will cause problems if ALT_COMPILER_PATH is defined to ""
1.43 + # which is a directive to use the PATH.
1.44 + REBASE = $(COMPILER_PATH)../REBASE
1.45 + endif
1.46 endif
1.47 ifndef COMPILER_PATH
1.48 COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
