Mercurial > hg > openjdk > icedtea > jdk7 > jdk
changeset 2497:416cfd5c6ca9
6903970: VS2008/VS2010 build fails in make/sun/jkernel because of "afxres.h" missing
Reviewed-by: ohair, art
| author | prr |
|---|---|
| date | Wed, 19 May 2010 09:45:05 -0700 |
| parents | 7bbb5f3b6eed |
| children | 7a1873e045cb |
| files | make/common/shared/Defs-windows.gmk make/sun/jkernel/Makefile |
| diffstat | 2 files changed, 15 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/shared/Defs-windows.gmk Tue May 11 14:36:10 2010 -0700 +++ b/make/common/shared/Defs-windows.gmk Wed May 19 09:45:05 2010 -0700 @@ -287,11 +287,15 @@ # Assume VS100, then VS90, then VS80, then VS71 _redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC100.CRT) ifeq ($(_redist_sdk),) - _redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC90.CRT) - ifeq ($(_redist_sdk),) - _redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC80.CRT) + ifneq ($(VS100COMNTOOLS),) + _redist_sdk :=c:/windows/system32 + else + _redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC90.CRT) ifeq ($(_redist_sdk),) - _redist_sdk :=$(call FullPath,$(_msvc_dir)/../SDK/v1.1/Bin) + _redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC80.CRT) + ifeq ($(_redist_sdk),) + _redist_sdk :=$(call FullPath,$(_msvc_dir)/../SDK/v1.1/Bin) + endif endif endif endif
--- a/make/sun/jkernel/Makefile Tue May 11 14:36:10 2010 -0700 +++ b/make/sun/jkernel/Makefile Wed May 19 09:45:05 2010 -0700 @@ -52,6 +52,11 @@ ifeq ($(PLATFORM), windows) +# If this is the VS Express compiler it will lack vc/atlmfc/ +ATL_MFC_DIR :=$(call DirExists,$(COMPILER_PATH)/../atlmfc,,) + +ifneq ($(ATL_MFC_DIR),) + include FILES_c_windows.gmk vpath %.cpp $(PLATFORM_SRC)/native/sun/jkernel @@ -67,6 +72,8 @@ endif +endif + # # Resources #