diff options
| -rw-r--r-- | jnlp-files/jogl-all.jnlp | 2 | ||||
| -rw-r--r-- | jnlp-files/jogl-core.jnlp | 4 | ||||
| -rw-r--r-- | jnlp-files/jogl-gl2es12.jnlp | 2 | ||||
| -rw-r--r-- | jnlp-files/nativewindow.jnlp | 4 | ||||
| -rw-r--r-- | jnlp-files/newt.jnlp | 4 | ||||
| -rw-r--r-- | src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTNativeLibLoader.java | 9 |
6 files changed, 16 insertions, 9 deletions
diff --git a/jnlp-files/jogl-all.jnlp b/jnlp-files/jogl-all.jnlp index b91410302..032cdd03e 100644 --- a/jnlp-files/jogl-all.jnlp +++ b/jnlp-files/jogl-all.jnlp @@ -44,7 +44,7 @@ <jar href="jogl.glu.gl2.jar" /> <jar href="jogl.gl2.dbg.jar" /> </resources> - <resources os="Mac\ OS\ X"> + <resources os="Mac OS X"> <jar href="jogl.gl2.osx.jar" /> <jar href="jogl.util.gl2.jar" /> <jar href="jogl.glu.gl2.jar" /> diff --git a/jnlp-files/jogl-core.jnlp b/jnlp-files/jogl-core.jnlp index ebc89a92d..2a0031613 100644 --- a/jnlp-files/jogl-core.jnlp +++ b/jnlp-files/jogl-core.jnlp @@ -56,10 +56,10 @@ <resources os="Linux" arch="x86_64"> <nativelib href = "jogl-natives-linux-amd64.jar" /> </resources> - <resources os="Mac\ OS\ X" arch="i386"> + <resources os="Mac OS X" arch="i386"> <nativelib href = "jogl-natives-macosx-universal.jar" /> </resources> - <resources os="Mac\ OS\ X" arch="x86_64"> + <resources os="Mac OS X" arch="x86_64"> <nativelib href = "jogl-natives-macosx-universal.jar" /> </resources> diff --git a/jnlp-files/jogl-gl2es12.jnlp b/jnlp-files/jogl-gl2es12.jnlp index a90bebb21..153d02821 100644 --- a/jnlp-files/jogl-gl2es12.jnlp +++ b/jnlp-files/jogl-gl2es12.jnlp @@ -38,7 +38,7 @@ <jar href="jogl.gl2es12.x11.jar" /> <jar href="jogl.gl2es12.dbg.jar" /> </resources> - <resources os="Mac\ OS\ X"> + <resources os="Mac OS X"> <jar href="jogl.gl2es12.osx.jar" /> <jar href="jogl.gl2es12.dbg.jar" /> </resources> diff --git a/jnlp-files/nativewindow.jnlp b/jnlp-files/nativewindow.jnlp index 6844e5217..e49d6c4ac 100644 --- a/jnlp-files/nativewindow.jnlp +++ b/jnlp-files/nativewindow.jnlp @@ -53,10 +53,10 @@ <resources os="Linux" arch="x86_64"> <nativelib href = "nativewindow-natives-linux-amd64.jar" /> </resources> - <resources os="Mac\ OS\ X" arch="i386"> + <resources os="Mac OS X" arch="i386"> <nativelib href = "nativewindow-natives-macosx-universal.jar" /> </resources> - <resources os="Mac\ OS\ X" arch="x86_64"> + <resources os="Mac OS X" arch="x86_64"> <nativelib href = "nativewindow-natives-macosx-universal.jar" /> </resources> diff --git a/jnlp-files/newt.jnlp b/jnlp-files/newt.jnlp index dcbc1d300..538760369 100644 --- a/jnlp-files/newt.jnlp +++ b/jnlp-files/newt.jnlp @@ -53,10 +53,10 @@ <resources os="Linux" arch="x86_64"> <nativelib href = "newt-natives-linux-amd64.jar" /> </resources> - <resources os="Mac\ OS\ X" arch="i386"> + <resources os="Mac OS X" arch="i386"> <nativelib href = "newt-natives-macosx-universal.jar" /> </resources> - <resources os="Mac\ OS\ X" arch="x86_64"> + <resources os="Mac OS X" arch="x86_64"> <nativelib href = "newt-natives-macosx-universal.jar" /> </resources> diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTNativeLibLoader.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTNativeLibLoader.java index f0f2ac8c3..bc963277a 100644 --- a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTNativeLibLoader.java +++ b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTNativeLibLoader.java @@ -62,7 +62,14 @@ public class JAWTNativeLibLoader extends NativeLibLoaderBase { // will succeed since JAWT shared object isn't in // default library path if ( ! NativeWindowFactory.TYPE_MACOSX.equals( NativeWindowFactory.getNativeWindowType(false) ) ) { - loadLibrary("jawt", null, true); + try { + loadLibrary("jawt", null, true); + } catch (Throwable t) { + // It might be ok .. if it's already loaded + if(DEBUG) { + t.printStackTrace(); + } + } } return null; } |