michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/LWJGL/lwjgl

This commit is contained in:
Ioannis Tsakpinis 2013-03-27 13:11:51 +02:00
parent b83264e296 27f66983fc
commit 82fc3bf6bf
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform_build/macosx_ant/build.xml
View File

File diff suppressed because one or more lines are too long

15
src/java/org/lwjgl/MacOSXSysImplementation.java
View File

@ -44,24 +44,11 @@ import java.lang.UnsatisfiedLinkError;
* $Id$
*/
final class MacOSXSysImplementation extends J2SESysImplementation {
private static final int JNI_VERSION = 23;
private static final int JNI_VERSION = 24;
static {
// Manually start the AWT Application Loop
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() {

1
src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m
View File

@ -225,6 +225,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXContextImplementation_nDestro
[context_info->context performSelectorOnMainThread:@selector(clearDrawable) withObject:nil waitUntilDone:YES];
if (context_info->peer_info->isWindowed) {
[context_info->peer_info->window_info->view setOpenGLContext:nil];
[context_info->context release];
context_info->context = nil;
context_info->peer_info->window_info->context = nil;