6903970: VS2008/VS2010 build fails in make/sun/jkernel because of "afxres.h" missing

Reviewed-by: ohair, art

make/common/shared/Defs-windows.gmk

@@ -287,6 +287,9 @@ ifeq ($(ARCH_DATA_MODEL), 32)
     # Assume VS100, then VS90, then VS80, then VS71
     _redist_sdk   :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC100.CRT)
     ifeq ($(_redist_sdk),)
+      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)/redist/x86/Microsoft.VC80.CRT)
@@ -296,6 +299,7 @@ ifeq ($(ARCH_DATA_MODEL), 32)
         endif
       endif
     endif
+  endif
 endif
 
 # The Microsoft Platform SDK installed by itself

make/sun/jkernel/Makefile

@@ -52,6 +52,11 @@ ifeq ($(ARCH_DATA_MODEL), 32)
 
 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
 
+endif
+
 #
 # Resources
 #