diff --git a/build.xml b/build.xml
index e0cb53b4..45b88278 100644
--- a/build.xml
+++ b/build.xml
@@ -322,12 +322,14 @@
-
+
+
+
diff --git a/platform_build/macosx_ant/build.xml b/platform_build/macosx_ant/build.xml
index b1696a34..0cde0b42 100644
--- a/platform_build/macosx_ant/build.xml
+++ b/platform_build/macosx_ant/build.xml
@@ -1,103 +1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/src/java/org/lwjgl/MacOSXSysImplementation.java b/src/java/org/lwjgl/MacOSXSysImplementation.java
index 54506609..fa1d56da 100644
--- a/src/java/org/lwjgl/MacOSXSysImplementation.java
+++ b/src/java/org/lwjgl/MacOSXSysImplementation.java
@@ -31,9 +31,11 @@
*/
package org.lwjgl;
-import java.awt.Toolkit;
-
import com.apple.eio.FileManager;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedExceptionAction;
+import java.lang.UnsatisfiedLinkError;
/**
*
@@ -45,10 +47,23 @@ final class MacOSXSysImplementation extends J2SESysImplementation {
private static final int JNI_VERSION = 23;
static {
- // Make sure AWT is properly initialized. This avoids hangs on Mac OS X 10.3
- Toolkit.getDefaultToolkit();
+ // Manually start the AWT Application Loop
+ java.awt.Toolkit.getDefaultToolkit();
+
+ // manually load libjawt.dylib into vm, needed since Java 7
+ AccessController.doPrivileged(new PrivilegedAction