1.1 --- a/make/common/shared/Defs-windows.gmk Wed Mar 11 14:38:02 2009 -0700
1.2 +++ b/make/common/shared/Defs-windows.gmk Wed Mar 11 17:31:56 2009 -0700
1.3 @@ -282,13 +282,27 @@
1.4
1.5 # Compilers for 64bit are from SDK
1.6 ifeq ($(ARCH_DATA_MODEL), 64)
1.7 - ifneq ($(_ms_sdk),)
1.8 + xMSSDK61 :="C:/Program Files/Microsoft SDKs/Windows/v6.1/"
1.9 + MSSDK61 :=$(call FullPath,$(xMSSDK61))
1.10 + xVS2008 :="C:/Program Files (x86)/Microsoft Visual Studio 9.0/"
1.11 + _vs2008 :=$(call FullPath,$(xVS2008))
1.12 + ifneq ($(_vs2008),)
1.13 ifeq ($(ARCH), ia64)
1.14 - _compiler_bin :=$(_ms_sdk)/Bin/Win64
1.15 + _compiler_bin :=$(_vs2008)/VC/Bin/x86_ia64
1.16 endif
1.17 ifeq ($(ARCH), amd64)
1.18 - _compiler_bin :=$(_ms_sdk)/Bin/Win64/x86/$(ARCH)
1.19 - _redist_sdk :=$(_ms_sdk)/redist/win64/AMD64
1.20 + _compiler_bin :=$(_vs2008)/VC/Bin/$(ARCH)
1.21 + _redist_sdk :=$(MSSDK61)/VC/redist
1.22 + endif
1.23 + else
1.24 + ifneq ($(_ms_sdk),)
1.25 + ifeq ($(ARCH), ia64)
1.26 + _compiler_bin :=$(_ms_sdk)/Bin/Win64
1.27 + endif
1.28 + ifeq ($(ARCH), amd64)
1.29 + _compiler_bin :=$(_ms_sdk)/Bin/Win64/x86/$(ARCH)
1.30 + _redist_sdk :=$(_ms_sdk)/redist/win64/AMD64
1.31 + endif
1.32 endif
1.33 endif
1.34 endif
