Merge branch 'master' of https://github.com/LWJGL/lwjgl
This commit is contained in:
commit
82fc3bf6bf
File diff suppressed because one or more lines are too long
|
@ -44,24 +44,11 @@ import java.lang.UnsatisfiedLinkError;
|
||||||
* $Id$
|
* $Id$
|
||||||
*/
|
*/
|
||||||
final class MacOSXSysImplementation extends J2SESysImplementation {
|
final class MacOSXSysImplementation extends J2SESysImplementation {
|
||||||
private static final int JNI_VERSION = 23;
|
private static final int JNI_VERSION = 24;
|
||||||
|
|
||||||
static {
|
static {
|
||||||
// Manually start the AWT Application Loop
|
// Manually start the AWT Application Loop
|
||||||
java.awt.Toolkit.getDefaultToolkit();
|
java.awt.Toolkit.getDefaultToolkit();
|
||||||
|
|
||||||
// manually load libjawt.dylib into vm, needed since Java 7
|
|
||||||
AccessController.doPrivileged(new PrivilegedAction<Object>() {
|
|
||||||
public Object run() {
|
|
||||||
try {
|
|
||||||
System.loadLibrary("jawt");
|
|
||||||
} catch (UnsatisfiedLinkError e) {
|
|
||||||
// catch and ignore an already loaded in another classloader
|
|
||||||
// exception, as vm already has it loaded
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getRequiredJNIVersion() {
|
public int getRequiredJNIVersion() {
|
||||||
|
|
|
@ -225,6 +225,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXContextImplementation_nDestro
|
||||||
[context_info->context performSelectorOnMainThread:@selector(clearDrawable) withObject:nil waitUntilDone:YES];
|
[context_info->context performSelectorOnMainThread:@selector(clearDrawable) withObject:nil waitUntilDone:YES];
|
||||||
|
|
||||||
if (context_info->peer_info->isWindowed) {
|
if (context_info->peer_info->isWindowed) {
|
||||||
|
[context_info->peer_info->window_info->view setOpenGLContext:nil];
|
||||||
[context_info->context release];
|
[context_info->context release];
|
||||||
context_info->context = nil;
|
context_info->context = nil;
|
||||||
context_info->peer_info->window_info->context = nil;
|
context_info->peer_info->window_info->context = nil;
|
||||||
|
|
Loading…
Reference in New Issue