# HG changeset patch
# User ohair
# Date 1236817916 25200
# Node ID 9c0cc0d0eca2a70dd21b59fa7a264fcab05f492f
# Parent  53d5b45f73ab449aabfb3ed678396b7c697988a0
6816311: Changes to allow builds with latest Windows SDK 6.1 on 64bit Windows 2003
Reviewed-by: tbell

diff -r 53d5b45f73ab -r 9c0cc0d0eca2 make/common/shared/Compiler-msvc.gmk
--- a/make/common/shared/Compiler-msvc.gmk	Wed Mar 11 14:38:02 2009 -0700
+++ b/make/common/shared/Compiler-msvc.gmk	Wed Mar 11 17:31:56 2009 -0700
@@ -128,9 +128,19 @@
         endif
       endif
     endif
-    # This will cause problems if ALT_COMPILER_PATH is defined to ""
-    # which is a directive to use the PATH.
-    REBASE         = $(COMPILER_PATH)../REBASE
+    ifeq ($(CC_MAJORVER), 15)
+      # This should be: CC_VER=15.00.21022.8 LINK_VER=9.00.21022.8
+      REQUIRED_CC_VER = 15.00.21022.8
+      REQUIRED_LINK_VER = 9.00.21022.8
+      COMPILER_NAME=Windows SDK 6.1 Visual Studio 9
+      COMPILER_VERSION=VS2008
+      RC = $(MSSDK61)/bin/x64/rc
+      REBASE = $(MSSDK61/bin/x64/rebase
+    else
+      # This will cause problems if ALT_COMPILER_PATH is defined to ""
+      # which is a directive to use the PATH.
+      REBASE         = $(COMPILER_PATH)../REBASE
+    endif
     ifndef COMPILER_PATH
       COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
     endif
diff -r 53d5b45f73ab -r 9c0cc0d0eca2 make/common/shared/Defs-windows.gmk
--- a/make/common/shared/Defs-windows.gmk	Wed Mar 11 14:38:02 2009 -0700
+++ b/make/common/shared/Defs-windows.gmk	Wed Mar 11 17:31:56 2009 -0700
@@ -282,13 +282,27 @@
 
 # Compilers for 64bit are from SDK
 ifeq ($(ARCH_DATA_MODEL), 64)
-  ifneq ($(_ms_sdk),)
+  xMSSDK61 :="C:/Program Files/Microsoft SDKs/Windows/v6.1/"
+  MSSDK61 :=$(call FullPath,$(xMSSDK61))
+  xVS2008 :="C:/Program Files (x86)/Microsoft Visual Studio 9.0/"
+  _vs2008 :=$(call FullPath,$(xVS2008))
+  ifneq ($(_vs2008),)
     ifeq ($(ARCH), ia64)
-      _compiler_bin :=$(_ms_sdk)/Bin/Win64
+      _compiler_bin :=$(_vs2008)/VC/Bin/x86_ia64
     endif
     ifeq ($(ARCH), amd64)
-      _compiler_bin :=$(_ms_sdk)/Bin/Win64/x86/$(ARCH)
-      _redist_sdk   :=$(_ms_sdk)/redist/win64/AMD64
+      _compiler_bin :=$(_vs2008)/VC/Bin/$(ARCH)
+      _redist_sdk   :=$(MSSDK61)/VC/redist
+    endif
+  else
+    ifneq ($(_ms_sdk),)
+      ifeq ($(ARCH), ia64)
+        _compiler_bin :=$(_ms_sdk)/Bin/Win64
+      endif
+      ifeq ($(ARCH), amd64)
+        _compiler_bin :=$(_ms_sdk)/Bin/Win64/x86/$(ARCH)
+        _redist_sdk   :=$(_ms_sdk)/redist/win64/AMD64
+      endif
     endif
   endif
 endif
diff -r 53d5b45f73ab -r 9c0cc0d0eca2 src/windows/resource/version.rc
--- a/src/windows/resource/version.rc	Wed Mar 11 14:38:02 2009 -0700
+++ b/src/windows/resource/version.rc	Wed Mar 11 17:31:56 2009 -0700
@@ -23,7 +23,7 @@
 // have any questions.
 //
 
-#include "afxres.h"
+#include "windows.h"
 
 // Need 2 defines so macro argument to XSTR will get expanded before quoting.
 #define XSTR(x) STR(x)