6931180: Migration to recent versions of MS Platform SDK
6944048: VS2010 build failure in make/com/sun/java/pack: missing unpack200.exe.manifest
6944015: VS2010 build failure in awt_TextArea.cpp: ambiguous call to abs()
6936319: JDK build fails in awt_DnDDS.cpp with Visual Studio 2008/Platform SDK 7
6944516: Windows L&F is broken in SwingSet2, when JDK is built with the recent Windows SDK
Summary: Changes to enable building JDK7 with Microsoft Visual Studio 2010
Reviewed-by: ohair, art, ccheung, dcubed
diff --git a/src/windows/bin/java_md.c b/src/windows/bin/java_md.c
index a4fa4cc..0342660 100644
--- a/src/windows/bin/java_md.c
+++ b/src/windows/bin/java_md.c
@@ -148,11 +148,18 @@
* assumed to be present in the "JRE path" directory. If it is not found
* there (or "JRE path" fails to resolve), skip the explicit load and let
* nature take its course, which is likely to be a failure to execute.
+ * This is clearly completely specific to the exact compiler version
+ * which isn't very nice, but its hardly the only place.
+ * No attempt to look for compiler versions in between 2003 and 2010
+ * as we aren't supporting building with those.
*/
#ifdef _MSC_VER
#if _MSC_VER < 1400
#define CRT_DLL "msvcr71.dll"
#endif
+#if _MSC_VER >= 1600
+#define CRT_DLL "msvcr100.dll"
+#endif
#ifdef CRT_DLL
if (GetJREPath(crtpath, MAXPATHLEN)) {
(void)JLI_StrCat(crtpath, "\\bin\\" CRT_DLL); /* Add crt dll */