Refresh nomacosx.patch
Markus Koschany
8 years ago
| 0 | From: Markus Koschany <apo@debian.org> | |
| 1 | Date: Sat, 9 Apr 2016 18:59:10 +0200 | |
| 2 | Subject: nomacosx | |
| 3 | ||
| 4 | --- | |
| 5 | build.xml | 12 ++++++------ | |
| 6 | platform_build/build-applet.xml | 4 ++-- | |
| 7 | src/java/org/lwjgl/MacOSXSysImplementation.java | 4 ++-- | |
| 8 | 3 files changed, 10 insertions(+), 10 deletions(-) | |
| 9 | ||
| 10 | diff --git a/build.xml b/build.xml | |
| 11 | index 736c91a..2b5105e 100644 | |
| 12 | --- a/build.xml | |
| 13 | +++ b/build.xml | |
| 14 | @@ -331,7 +331,7 @@ | |
| 15 | <class name="org.lwjgl.opengl.WindowsPeerInfo"/> | |
| 16 | </javah> | |
| 17 | ||
| 18 | - <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx"> | |
| 19 | + <!--<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx"> | |
| 20 | <class name="org.lwjgl.MacOSXSysImplementation" /> | |
| 21 | <class name="org.lwjgl.opengl.MacOSXCanvasPeerInfo" /> | |
| 22 | <class name="org.lwjgl.opengl.MacOSXPeerInfo" /> | |
| 23 | @@ -341,7 +341,7 @@ | |
| 24 | <class name="org.lwjgl.opengl.MacOSXNativeKeyboard" /> | |
| 25 | <class name="org.lwjgl.opengl.MacOSXNativeMouse" /> | |
| 26 | <class name="org.lwjgl.opengl.MacOSXMouseEventQueue" /> | |
| 27 | - </javah> | |
| 28 | + </javah>--> | |
| 29 | ||
| 30 | <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}"> | |
| 31 | <class name="org.lwjgl.opengl.AWTSurfaceLock" /> | |
| 32 | @@ -394,13 +394,13 @@ | |
| 33 | </tokenfilter> | |
| 34 | </filterchain> | |
| 35 | </loadfile> | |
| 36 | - <loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version"> | |
| 37 | + <!--<loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version"> | |
| 38 | <filterchain> | |
| 39 | <tokenfilter> | |
| 40 | <containsstring contains="JNI_VERSION ="/> | |
| 41 | </tokenfilter> | |
| 42 | </filterchain> | |
| 43 | - </loadfile> | |
| 44 | + </loadfile>--> | |
| 45 | <loadfile srcfile="${lwjgl.src.native}/windows/org_lwjgl_WindowsSysImplementation.h" property="lwjgl.native.windows.version"> | |
| 46 | <filterchain> | |
| 47 | <tokenfilter> | |
| 48 | @@ -415,13 +415,13 @@ | |
| 49 | </tokenfilter> | |
| 50 | </filterchain> | |
| 51 | </loadfile> | |
| 52 | - <loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version"> | |
| 53 | + <!--<loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version"> | |
| 54 | <filterchain> | |
| 55 | <tokenfilter> | |
| 56 | <containsstring contains="#define org_lwjgl_MacOSXSysImplementation_JNI_VERSION"/> | |
| 57 | </tokenfilter> | |
| 58 | </filterchain> | |
| 59 | - </loadfile> | |
| 60 | + </loadfile>--> | |
| 61 | <echo> | |
| 62 | lwjgl.java.windows.version = ${lwjgl.java.windows.version} | |
| 63 | lwjgl.native.windows.version = ${lwjgl.native.windows.version} | |
| 64 | diff --git a/platform_build/build-applet.xml b/platform_build/build-applet.xml | |
| 65 | index 588347d..5f95b13 100644 | |
| 66 | --- a/platform_build/build-applet.xml | |
| 67 | +++ b/platform_build/build-applet.xml | |
| 68 | @@ -1,7 +1,7 @@ | |
| 69 | <project name="applet"> | |
| 70 | ||
| 71 | <!-- Create our packer task --> | |
| 72 | - <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/> | |
| 73 | + <!--<taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/>--> | |
| 74 | ||
| 75 | <target name="applet"> | |
| 76 | <antcall target="-applet"> | |
| 77 | @@ -144,4 +144,4 @@ | |
| 78 | <param name="output" value="applet/advance/solaris_natives.jar.lzma"/> | |
| 79 | </antcall> | |
| 80 | </target> | |
| 81 | -</project> | |
| 82 | \ No newline at end of file | |
| 83 | +</project> | |
| 84 | diff --git a/src/java/org/lwjgl/MacOSXSysImplementation.java b/src/java/org/lwjgl/MacOSXSysImplementation.java | |
| 85 | index b92cdee..599abe2 100644 | |
| 86 | --- a/src/java/org/lwjgl/MacOSXSysImplementation.java | |
| 87 | +++ b/src/java/org/lwjgl/MacOSXSysImplementation.java | |
| 88 | @@ -31,7 +31,7 @@ | |
| 89 | */ | |
| 90 | package org.lwjgl; | |
| 91 | ||
| 92 | -import com.apple.eio.FileManager; | |
| 93 | +//import com.apple.eio.FileManager; | |
| 94 | import java.security.AccessController; | |
| 95 | import java.security.PrivilegedAction; | |
| 96 | import java.security.PrivilegedExceptionAction; | |
| 97 | @@ -57,7 +57,7 @@ final class MacOSXSysImplementation extends J2SESysImplementation { | |
| 98 | ||
| 99 | public boolean openURL(String url) { | |
| 100 | try { | |
| 101 | - FileManager.openURL(url); | |
| 102 | + //FileManager.openURL(url); | |
| 103 | return true; | |
| 104 | } catch (Exception e) { | |
| 105 | LWJGLUtil.log("Exception occurred while trying to invoke browser: " + e); |