1.1 --- a/make/common/shared/Defs-windows.gmk Thu Apr 29 14:32:40 2010 -0700
1.2 +++ b/make/common/shared/Defs-windows.gmk Tue May 11 14:35:21 2010 -0700
1.3 @@ -222,6 +222,17 @@
1.4 ifneq ($(subst MSDev98,OLDOLDOLD,$(SHORTMSVCDIR)),$(SHORTMSVCDIR))
1.5 SHORTMSVCDIR :=
1.6 endif
1.7 + # If we still don't have it, look for VS100COMNTOOLS, setup by installer?
1.8 + ifeq ($(SHORTMSVCDIR),)
1.9 + ifdef VS100COMNTOOLS # /Common/Tools directory, use ../../Vc
1.10 + xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))"
1.11 + _vs100tools :=$(call FullPath,$(xVS100COMNTOOLS))
1.12 + endif
1.13 + ifneq ($(_vs100tools),)
1.14 + SHORTMSVCDIR :=$(_vs100tools)/../../Vc
1.15 + endif
1.16 + endif
1.17 + export SHORTMSVCDIR
1.18 # If we still don't have it, look for VS71COMNTOOLS, setup by installer?
1.19 ifeq ($(SHORTMSVCDIR),)
1.20 ifdef VS71COMNTOOLS # /Common/Tools directory, use ../../Vc7
1.21 @@ -272,24 +283,35 @@
1.22 # Compilers for 64bit are from SDK
1.23 ifeq ($(ARCH_DATA_MODEL), 64)
1.24 ifndef SHORTCOMPILERBIN
1.25 - xMSSDK61 :="C:/Program Files/Microsoft SDKs/Windows/v6.1/"
1.26 - MSSDK61 :=$(call FullPath,$(xMSSDK61))
1.27 - xVS2008 :="C:/Program Files (x86)/Microsoft Visual Studio 9.0/"
1.28 - _vs2008 :=$(call FullPath,$(xVS2008))
1.29 - ifneq ($(_vs2008),)
1.30 - ifeq ($(ARCH), ia64)
1.31 - SHORTCOMPILERBIN :=$(_vs2008)/VC/Bin/x86_ia64
1.32 - endif
1.33 - ifeq ($(ARCH), amd64)
1.34 - SHORTCOMPILERBIN :=$(_vs2008)/VC/Bin/$(ARCH)
1.35 - endif
1.36 + ifdef VS100COMNTOOLS # /Common7/Tools directory, use ../../Vc
1.37 + xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))"
1.38 + _vs100tools :=$(call FullPath,$(xVS100COMNTOOLS))
1.39 + endif
1.40 + ifneq ($(_vs100tools),)
1.41 + SHORTCOMPILERBIN :=$(_vs100tools)/../../Vc/bin/amd64
1.42 + xMSSDK70 :="C:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/"
1.43 + MSSDK7 :=$(call FullPath,$(xMSSDK70))
1.44 + export MSSDK7
1.45 else
1.46 - ifneq ($(SHORTPSDK),)
1.47 + xMSSDK61 :="C:/Program Files/Microsoft SDKs/Windows/v6.1/"
1.48 + MSSDK61 :=$(call FullPath,$(xMSSDK61))
1.49 + xVS2008 :="C:/Program Files (x86)/Microsoft Visual Studio 9.0/"
1.50 + _vs2008 :=$(call FullPath,$(xVS2008))
1.51 + ifneq ($(_vs2008),)
1.52 ifeq ($(ARCH), ia64)
1.53 - SHORTCOMPILERBIN :=$(SHORTPSDK)/Bin/Win64
1.54 + SHORTCOMPILERBIN :=$(_vs2008)/VC/Bin/x86_ia64
1.55 endif
1.56 ifeq ($(ARCH), amd64)
1.57 - SHORTCOMPILERBIN :=$(SHORTPSDK)/Bin/Win64/x86/$(ARCH)
1.58 + SHORTCOMPILERBIN :=$(_vs2008)/VC/Bin/$(ARCH)
1.59 + endif
1.60 + else
1.61 + ifneq ($(SHORTPSDK),)
1.62 + ifeq ($(ARCH), ia64)
1.63 + SHORTCOMPILERBIN :=$(SHORTPSDK)/Bin/Win64
1.64 + endif
1.65 + ifeq ($(ARCH), amd64)
1.66 + SHORTCOMPILERBIN :=$(SHORTPSDK)/Bin/Win64/x86/$(ARCH)
1.67 + endif
1.68 endif
1.69 endif
1.70 endif
