changeset 1664:a1a023f0fd3b

get rid if loading of msvcr100.dll that was done in common code
author snorthov
date Mon, 20 Aug 2012 18:25:59 -0400
parents 6e30ae5e68a2
children 5ba63022681b
files javafx-ui-common/src/com/sun/javafx/tk/Toolkit.java
diffstat 1 files changed, 0 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-common/src/com/sun/javafx/tk/Toolkit.java	Mon Aug 20 17:10:42 2012 -0400
+++ b/javafx-ui-common/src/com/sun/javafx/tk/Toolkit.java	Mon Aug 20 18:25:59 2012 -0400
@@ -151,25 +151,6 @@
                 return Boolean.getBoolean("javafx.verbose");
             }
         });
-
-        // This loading of msvcr100.dll (VS2010) is required when run with Java 6
-        // since it was build with VS2003 and doesn't include msvcr100.dll in it's JRE.
-        // Note: See README-builds.html on MSVC requirement: VS2010 is required.
-        if (PlatformUtil.isWindows()) {
-            AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                public Object run() {
-                    try {
-                        com.sun.javafx.runtime.NativeLibLoader.loadLibrary("msvcr100");
-                    } catch (Throwable t) {
-			if (verbose) {
-                            System.err.println("Error: failed to load msvcr100.dll : " + t);
-                        }
-                    }
-                    return null;
-                }
-            });
-        }
-
         AccessController.doPrivileged(new PrivilegedAction<Object>() {
             public Object run() {
                 // Get the javafx.version and javafx.runtime.version from a preconstructed