1.1 --- a/make/common/shared/Defs-windows.gmk	Wed May 19 12:27:47 2010 -0700
     1.2 +++ b/make/common/shared/Defs-windows.gmk	Wed May 19 20:16:33 2010 -0700
     1.3 @@ -287,11 +287,15 @@
     1.4      # Assume VS100, then VS90, then VS80, then VS71
     1.5      _redist_sdk   :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC100.CRT)
     1.6      ifeq ($(_redist_sdk),)
     1.7 -      _redist_sdk   :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC90.CRT)
     1.8 -      ifeq ($(_redist_sdk),)
     1.9 -        _redist_sdk   :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC80.CRT)
    1.10 +      ifneq ($(VS100COMNTOOLS),)
    1.11 +        _redist_sdk  :=c:/windows/system32
    1.12 +      else
    1.13 +        _redist_sdk   :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC90.CRT)
    1.14          ifeq ($(_redist_sdk),)
    1.15 -          _redist_sdk   :=$(call FullPath,$(_msvc_dir)/../SDK/v1.1/Bin)
    1.16 +          _redist_sdk   :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC80.CRT)
    1.17 +          ifeq ($(_redist_sdk),)
    1.18 +            _redist_sdk   :=$(call FullPath,$(_msvc_dir)/../SDK/v1.1/Bin)
    1.19 +          endif
    1.20          endif
    1.21        endif
    1.22      endif

     2.1 --- a/make/sun/jkernel/Makefile	Wed May 19 12:27:47 2010 -0700
     2.2 +++ b/make/sun/jkernel/Makefile	Wed May 19 20:16:33 2010 -0700
     2.3 @@ -52,6 +52,11 @@
     2.4  
     2.5  ifeq ($(PLATFORM), windows)
     2.6  
     2.7 +# If this is the VS Express compiler it will lack vc/atlmfc/
     2.8 +ATL_MFC_DIR :=$(call DirExists,$(COMPILER_PATH)/../atlmfc,,)
     2.9 +
    2.10 +ifneq ($(ATL_MFC_DIR),)
    2.11 +
    2.12  include FILES_c_windows.gmk
    2.13  
    2.14  vpath %.cpp   $(PLATFORM_SRC)/native/sun/jkernel
    2.15 @@ -67,6 +72,8 @@
    2.16  
    2.17  endif
    2.18  
    2.19 +endif
    2.20 +
    2.21  #
    2.22  # Resources
    2.23  #