1.1 --- a/make/common/shared/Defs-windows.gmk	Thu Jun 10 13:59:09 2010 -0700
     1.2 +++ b/make/common/shared/Defs-windows.gmk	Wed Jun 16 15:49:13 2010 -0700
     1.3 @@ -331,23 +331,50 @@
     1.4    endif
     1.5  endif
     1.6  
     1.7 -# Compilers for 64bit may be from SDK. For VS 2010 we use those.
     1.8 -# The Express compilers don't contain 64 bit compilers, so in
     1.9 -# that case, you additionally need the SDK. At this time,
    1.10 -# there's no 64 bit SDK available that has VS 2010.
    1.11 -# Presumably SDK v7.1 will provide that and we may want to update
    1.12 -# the logic here to work with that.
    1.13 -# However official builds will use the Professional version.
    1.14 +# Compilers for 64bit may be from the free SDK, or Visual Studio Professional
    1.15 +# The free Express compilers don't contain 64 bit compilers, which is why
    1.16 +# you instead need the SDK.
    1.17 +# So for VS2010 based builds, either VS2010 Pro with the 7.0a SDK, or
    1.18 +# the Windows 7.1 standalone SDK with compilers may be used.
    1.19 +# Release enginering will use VS2010 Pro, so the frequency of testing of
    1.20 +# SDK based builds will depend entirely on individual usage.
    1.21  ifeq ($(ARCH_DATA_MODEL), 64)
    1.22    ifdef VS100COMNTOOLS  # /Common7/Tools directory, use ../../Vc
    1.23 +    # VS2010 default location is used when building 64 bit using the 7.1 SDK
    1.24 +    # This is safe to hardwire as the SDK installer won't let you change it
    1.25 +    # and the VS2010 variable is only used if the compilers are from the SDK
    1.26 +    xVS2010 :="$(_program_files32)/Microsoft Visual Studio 10.0/"
    1.27 +    VS2010 :=$(call FullPath,$(xVS2010))
    1.28      xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))"
    1.29      _vs100tools     :=$(call FullPath,$(xVS100COMNTOOLS))
    1.30    endif
    1.31    ifneq ($(_vs100tools),)
    1.32      _compiler_bin :=$(_vs100tools)/../../Vc/bin/amd64
    1.33 -    _redist_sdk   :=$(_vs100tools)/../../Vc/redist/x64/Microsoft.VC100.CRT
    1.34 -    xMSSDK70      :="$(_program_files32)/Microsoft SDKs/Windows/v7.0a/"
    1.35 -    MSSDK70       :=$(call FullPath,$(xMSSDK70))
    1.36 +    x_redist_sdk   :=$(_vs100tools)/../../Vc/redist/x64/Microsoft.VC100.CRT
    1.37 +    _redist_sdk    :=$(call FullPath,$(x_redist_sdk))
    1.38 +    # The SDK doesn't have the redist directory, but the DLL is installed
    1.39 +    # into the windows directory.
    1.40 +    ifeq ($(_redist_sdk),)
    1.41 +      _redist_sdk   :=c:/windows/system32
    1.42 +    endif
    1.43 +    # Not currently using MSSDK7n, but maybe we can make use of it for
    1.44 +    # doing default location lookup to find some SDK tools that presently
    1.45 +    # require the developer to explicitly set the path.
    1.46 +    # The 7.0a path is from VS2010 Pro, the 7.1 path is the standalone SDK.
    1.47 +    # Either will work for us.
    1.48 +    # If a developer chooses to install the standalone SDK in some other
    1.49 +    # location, then this will fail to find it, which won't matter so long as
    1.50 +    # we aren't using this variable. If we do they'd still need to set the
    1.51 +    # ALT_MSDEVTOOLS_PATH as now.
    1.52 +    # %WindowsSdkDir% could be referenced instead but the SDK installer
    1.53 +    # doesn't set it and in the case of the VS2010 compilers,
    1.54 +    # you can't change this location in the installer anyway.
    1.55 +    xMSSDK7n      :="$(_program_files32)/Microsoft SDKs/Windows/v7.0a/"
    1.56 +    MSSDK7n       :=$(call FullPath,$(xMSSDK7n))
    1.57 +    ifeq ($(MSSDK7n),)
    1.58 +      xMSSDK7n      :="$(_program_files32)/Microsoft SDKs/Windows/v7.1/"
    1.59 +      MSSDK7n       :=$(call FullPath,$(xMSSDK7n))
    1.60 +    endif
    1.61    else
    1.62      xVS2008 :="$(_program_files32)/Microsoft Visual Studio 9.0/"
    1.63      VS2008 :=$(call FullPath,$(xVS2008))
    1.64 @@ -355,7 +382,7 @@
    1.65        _compiler_bin :=$(VS2008)/VC/Bin/$(ARCH)
    1.66        xMSSDK61      :="$(_program_files)/Microsoft SDKs/Windows/v6.1/"
    1.67        MSSDK61       :=$(call FullPath,$(xMSSDK61))
    1.68 -      _redist_sdk   :=$(VS2008)/VC/redist/x86/Microsoft.VC90.CRT
    1.69 +      _redist_sdk   :=$(VS2008)/VC/redist/x64/Microsoft.VC90.CRT
    1.70      else
    1.71        ifneq ($(_ms_sdk),)
    1.72          ifeq ($(ARCH), ia64)

     2.1 --- a/make/tools/freetypecheck/freetypecheck.c	Thu Jun 10 13:59:09 2010 -0700
     2.2 +++ b/make/tools/freetypecheck/freetypecheck.c	Wed Jun 16 15:49:13 2010 -0700
     2.3 @@ -33,7 +33,7 @@
     2.4  #include FT_FREETYPE_H
     2.5  
     2.6  #ifdef _MSC_VER
     2.7 -#if _MSC_VER > 1400
     2.8 +#if _MSC_VER > 1400 && _MSC_VER < 1600
     2.9  
    2.10  /*
    2.11   * When building for Microsoft Windows, your program has a dependency
    2.12 @@ -68,7 +68,7 @@
    2.13          "publicKeyToken='" _VC_ASSEMBLY_PUBLICKEYTOKEN "'\"")
    2.14  
    2.15  #endif  /* _M_AMD64 */
    2.16 -#endif  /* _MSC_VER > 1400 */
    2.17 +#endif  /* _MSC_VER > 1400 && _MSC_VER < 1600 */
    2.18  #endif  /* _MSC_VER */
    2.19  
    2.20  #define QUOTEMACRO(x) QUOTEME(x)