6816311: Changes to allow builds with latest Windows SDK 6.1 on 64bit Windows 2003

Reviewed-by: tbell

corba/make/common/shared/Compiler-msvc.gmk

@@ -128,9 +128,19 @@ ifeq ($(PLATFORM), windows)
         endif
       endif
     endif
+    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

corba/make/common/shared/Defs-windows.gmk

@@ -282,6 +282,19 @@ endif
 
 # Compilers for 64bit are from SDK
 ifeq ($(ARCH_DATA_MODEL), 64)
+  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 :=$(_vs2008)/VC/Bin/x86_ia64
+    endif
+    ifeq ($(ARCH), 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
@@ -291,6 +304,7 @@ ifeq ($(ARCH_DATA_MODEL), 64)
         _redist_sdk   :=$(_ms_sdk)/redist/win64/AMD64
       endif
     endif
+  endif
 endif
 
 # Location on system where jdk installs might be

corba/src/windows/resource/version.rc

@@ -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)