Mercurial > jdk8-mips64-public > corba / changeset

     1.1 --- a/make/common/shared/Compiler-msvc.gmk	Wed Mar 11 14:38:02 2009 -0700
     1.2 +++ b/make/common/shared/Compiler-msvc.gmk	Wed Mar 11 17:31:56 2009 -0700
     1.3 @@ -128,9 +128,19 @@
     1.4          endif
     1.5        endif
     1.6      endif
     1.7 -    # This will cause problems if ALT_COMPILER_PATH is defined to ""
     1.8 -    # which is a directive to use the PATH.
     1.9 -    REBASE         = $(COMPILER_PATH)../REBASE
    1.10 +    ifeq ($(CC_MAJORVER), 15)
    1.11 +      # This should be: CC_VER=15.00.21022.8 LINK_VER=9.00.21022.8
    1.12 +      REQUIRED_CC_VER = 15.00.21022.8
    1.13 +      REQUIRED_LINK_VER = 9.00.21022.8
    1.14 +      COMPILER_NAME=Windows SDK 6.1 Visual Studio 9
    1.15 +      COMPILER_VERSION=VS2008
    1.16 +      RC = $(MSSDK61)/bin/x64/rc
    1.17 +      REBASE = $(MSSDK61/bin/x64/rebase
    1.18 +    else
    1.19 +      # This will cause problems if ALT_COMPILER_PATH is defined to ""
    1.20 +      # which is a directive to use the PATH.
    1.21 +      REBASE         = $(COMPILER_PATH)../REBASE
    1.22 +    endif
    1.23      ifndef COMPILER_PATH
    1.24        COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
    1.25      endif

     2.1 --- a/make/common/shared/Defs-windows.gmk	Wed Mar 11 14:38:02 2009 -0700
     2.2 +++ b/make/common/shared/Defs-windows.gmk	Wed Mar 11 17:31:56 2009 -0700
     2.3 @@ -282,13 +282,27 @@
     2.4  
     2.5  # Compilers for 64bit are from SDK
     2.6  ifeq ($(ARCH_DATA_MODEL), 64)
     2.7 -  ifneq ($(_ms_sdk),)
     2.8 +  xMSSDK61 :="C:/Program Files/Microsoft SDKs/Windows/v6.1/"
     2.9 +  MSSDK61 :=$(call FullPath,$(xMSSDK61))
    2.10 +  xVS2008 :="C:/Program Files (x86)/Microsoft Visual Studio 9.0/"
    2.11 +  _vs2008 :=$(call FullPath,$(xVS2008))
    2.12 +  ifneq ($(_vs2008),)
    2.13      ifeq ($(ARCH), ia64)
    2.14 -      _compiler_bin :=$(_ms_sdk)/Bin/Win64
    2.15 +      _compiler_bin :=$(_vs2008)/VC/Bin/x86_ia64
    2.16      endif
    2.17      ifeq ($(ARCH), amd64)
    2.18 -      _compiler_bin :=$(_ms_sdk)/Bin/Win64/x86/$(ARCH)
    2.19 -      _redist_sdk   :=$(_ms_sdk)/redist/win64/AMD64
    2.20 +      _compiler_bin :=$(_vs2008)/VC/Bin/$(ARCH)
    2.21 +      _redist_sdk   :=$(MSSDK61)/VC/redist
    2.22 +    endif
    2.23 +  else
    2.24 +    ifneq ($(_ms_sdk),)
    2.25 +      ifeq ($(ARCH), ia64)
    2.26 +        _compiler_bin :=$(_ms_sdk)/Bin/Win64
    2.27 +      endif
    2.28 +      ifeq ($(ARCH), amd64)
    2.29 +        _compiler_bin :=$(_ms_sdk)/Bin/Win64/x86/$(ARCH)
    2.30 +        _redist_sdk   :=$(_ms_sdk)/redist/win64/AMD64
    2.31 +      endif
    2.32      endif
    2.33    endif
    2.34  endif

     3.1 --- a/src/windows/resource/version.rc	Wed Mar 11 14:38:02 2009 -0700
     3.2 +++ b/src/windows/resource/version.rc	Wed Mar 11 17:31:56 2009 -0700
     3.3 @@ -23,7 +23,7 @@
     3.4  // have any questions.
     3.5  //
     3.6  
     3.7 -#include "afxres.h"
     3.8 +#include "windows.h"
     3.9  
    3.10  // Need 2 defines so macro argument to XSTR will get expanded before quoting.
    3.11  #define XSTR(x) STR(x)