From: Markus Koschany <apo@debian.org>
Date: Sat, 9 Apr 2016 18:59:10 +0200
Subject: nomacosx
We don't support MacOSX.
Forwarded: not-needed
---
build.xml | 12 ++++++------
platform_build/build-applet.xml | 4 ++--
src/java/org/lwjgl/MacOSXSysImplementation.java | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/build.xml b/build.xml
index 736c91a..2b5105e 100644
--- a/build.xml
+++ b/build.xml
@@ -331,7 +331,7 @@
<class name="org.lwjgl.opengl.WindowsPeerInfo"/>
</javah>
- <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx">
+ <!--<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx">
<class name="org.lwjgl.MacOSXSysImplementation" />
<class name="org.lwjgl.opengl.MacOSXCanvasPeerInfo" />
<class name="org.lwjgl.opengl.MacOSXPeerInfo" />
@@ -341,7 +341,7 @@
<class name="org.lwjgl.opengl.MacOSXNativeKeyboard" />
<class name="org.lwjgl.opengl.MacOSXNativeMouse" />
<class name="org.lwjgl.opengl.MacOSXMouseEventQueue" />
- </javah>
+ </javah>-->
<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}">
<class name="org.lwjgl.opengl.AWTSurfaceLock" />
@@ -394,13 +394,13 @@
</tokenfilter>
</filterchain>
</loadfile>
- <loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version">
+ <!--<loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version">
<filterchain>
<tokenfilter>
<containsstring contains="JNI_VERSION ="/>
</tokenfilter>
</filterchain>
- </loadfile>
+ </loadfile>-->
<loadfile srcfile="${lwjgl.src.native}/windows/org_lwjgl_WindowsSysImplementation.h" property="lwjgl.native.windows.version">
<filterchain>
<tokenfilter>
@@ -415,13 +415,13 @@
</tokenfilter>
</filterchain>
</loadfile>
- <loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version">
+ <!--<loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version">
<filterchain>
<tokenfilter>
<containsstring contains="#define org_lwjgl_MacOSXSysImplementation_JNI_VERSION"/>
</tokenfilter>
</filterchain>
- </loadfile>
+ </loadfile>-->
<echo>
lwjgl.java.windows.version = ${lwjgl.java.windows.version}
lwjgl.native.windows.version = ${lwjgl.native.windows.version}
diff --git a/platform_build/build-applet.xml b/platform_build/build-applet.xml
index 588347d..5f95b13 100644
--- a/platform_build/build-applet.xml
+++ b/platform_build/build-applet.xml
@@ -1,7 +1,7 @@
<project name="applet">
<!-- Create our packer task -->
- <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/>
+ <!--<taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/>-->
<target name="applet">
<antcall target="-applet">
@@ -144,4 +144,4 @@
<param name="output" value="applet/advance/solaris_natives.jar.lzma"/>
</antcall>
</target>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/java/org/lwjgl/MacOSXSysImplementation.java b/src/java/org/lwjgl/MacOSXSysImplementation.java
index b92cdee..599abe2 100644
--- a/src/java/org/lwjgl/MacOSXSysImplementation.java
+++ b/src/java/org/lwjgl/MacOSXSysImplementation.java
@@ -31,7 +31,7 @@
*/
package org.lwjgl;
-import com.apple.eio.FileManager;
+//import com.apple.eio.FileManager;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.security.PrivilegedExceptionAction;
@@ -57,7 +57,7 @@ final class MacOSXSysImplementation extends J2SESysImplementation {
public boolean openURL(String url) {
try {
- FileManager.openURL(url);
+ //FileManager.openURL(url);
return true;
} catch (Exception e) {
LWJGLUtil.log("Exception occurred while trying to invoke browser: " + e);