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

Remove dependency on Java Native Foundation framework, remove non 

working JAWT manually loading, change to use headers from
JavaVM.framework when compiling due to JDK7 bug
This commit is contained in:
kappaOne 2013-03-24 20:49:23 +00:00
parent 14de6c518d
commit c53e957833
3 changed files with 2 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

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

@ -49,19 +49,6 @@ final class MacOSXSysImplementation extends J2SESysImplementation {
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() {

2
src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m
View File

@ -40,7 +40,7 @@
#import <Cocoa/Cocoa.h>
#include <jni.h>
#include <jawt_md.h>
#include <JavaVM/jawt_md.h>
#include "awt_tools.h"
#include "org_lwjgl_opengl_MacOSXCanvasPeerInfo.h"
#include "context.h"