1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-by: tbell
This commit is contained in:
Kelly O'Hair 2009-03-11 17:31:56 -07:00
parent 83f34e5507
commit ad9390102d
3 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
corba/make/common/shared/Compiler-msvc.gmk
View File

@ -128,9 +128,19 @@ ifeq ($(PLATFORM), windows)
endif endif
endif 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 "" # This will cause problems if ALT_COMPILER_PATH is defined to ""
# which is a directive to use the PATH. # which is a directive to use the PATH.
REBASE = $(COMPILER_PATH)../REBASE REBASE = $(COMPILER_PATH)../REBASE
endif
ifndef COMPILER_PATH ifndef COMPILER_PATH
COMPILER_PATH := $(error COMPILER_PATH cannot be empty here) COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
endif endif

14
corba/make/common/shared/Defs-windows.gmk
View File

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

2
corba/src/windows/resource/version.rc
View File

@ -23,7 +23,7 @@
// have any questions. // have any questions.
// //
#include "afxres.h" #include "windows.h"
// Need 2 defines so macro argument to XSTR will get expanded before quoting. // Need 2 defines so macro argument to XSTR will get expanded before quoting.
#define XSTR(x) STR(x) #define XSTR(x) STR(x)