Drop nomacosx.patch
Markus Koschany
8 years ago
| 0 | Author: Gabriele Giacone <1o5g4r8o@gmail.com> | |
| 1 | Description: remove references to macosx-related classes | |
| 2 | ||
| 3 | --- a/build.xml | |
| 4 | +++ b/build.xml | |
| 5 | @@ -246,7 +246,7 @@ | |
| 6 | <class name="org.lwjgl.opengl.WindowsContextImplementation" /> | |
| 7 | </javah> | |
| 8 | ||
| 9 | - <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes"> | |
| 10 | + <!-- <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes"> | |
| 11 | <class name="org.lwjgl.MacOSXSysImplementation" /> | |
| 12 | <class name="org.lwjgl.opengl.MacOSXMouseEventQueue" /> | |
| 13 | <class name="org.lwjgl.opengl.MacOSXCanvasPeerInfo" /> | |
| 14 | @@ -254,7 +254,7 @@ | |
| 15 | <class name="org.lwjgl.opengl.MacOSXPbufferPeerInfo" /> | |
| 16 | <class name="org.lwjgl.opengl.MacOSXDisplay" /> | |
| 17 | <class name="org.lwjgl.opengl.MacOSXContextImplementation" /> | |
| 18 | - </javah> | |
| 19 | + </javah> --> | |
| 20 | ||
| 21 | <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}" force="yes"> | |
| 22 | <class name="org.lwjgl.opengl.AWTSurfaceLock" /> | |
| 23 | @@ -293,13 +293,13 @@ | |
| 24 | </tokenfilter> | |
| 25 | </filterchain> | |
| 26 | </loadfile> | |
| 27 | - <loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version"> | |
| 28 | + <!-- <loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version"> | |
| 29 | <filterchain> | |
| 30 | <tokenfilter> | |
| 31 | <containsstring contains="JNI_VERSION ="/> | |
| 32 | </tokenfilter> | |
| 33 | </filterchain> | |
| 34 | - </loadfile> | |
| 35 | + </loadfile> --> | |
| 36 | <loadfile srcfile="${lwjgl.src.native}/windows/org_lwjgl_WindowsSysImplementation.h" property="lwjgl.native.windows.version"> | |
| 37 | <filterchain> | |
| 38 | <tokenfilter> | |
| 39 | @@ -314,13 +314,13 @@ | |
| 40 | </tokenfilter> | |
| 41 | </filterchain> | |
| 42 | </loadfile> | |
| 43 | - <loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version"> | |
| 44 | + <!-- <loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version"> | |
| 45 | <filterchain> | |
| 46 | <tokenfilter> | |
| 47 | <containsstring contains="#define org_lwjgl_MacOSXSysImplementation_JNI_VERSION"/> | |
| 48 | </tokenfilter> | |
| 49 | </filterchain> | |
| 50 | - </loadfile> | |
| 51 | + </loadfile> --> | |
| 52 | <echo> | |
| 53 | lwjgl.java.windows.version = ${lwjgl.java.windows.version} | |
| 54 | lwjgl.native.windows.version = ${lwjgl.native.windows.version} | |
| 55 | --- a/platform_build/build-applet.xml | |
| 56 | +++ b/platform_build/build-applet.xml | |
| 57 | @@ -1,7 +1,7 @@ | |
| 58 | <project name="applet"> | |
| 59 | ||
| 60 | <!-- Create our packer task --> | |
| 61 | - <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/> | |
| 62 | +<!-- <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/> --> | |
| 63 | ||
| 64 | <target name="applet"> | |
| 65 | <antcall target="-applet"> | |
| 66 | --- a/src/java/org/lwjgl/MacOSXSysImplementation.java | |
| 67 | +++ b/src/java/org/lwjgl/MacOSXSysImplementation.java | |
| 68 | @@ -33,7 +33,7 @@ package org.lwjgl; | |
| 69 | ||
| 70 | import java.awt.Toolkit; | |
| 71 | ||
| 72 | -import com.apple.eio.FileManager; | |
| 73 | +//import com.apple.eio.FileManager; | |
| 74 | ||
| 75 | /** | |
| 76 | * | |
| 77 | @@ -55,7 +55,7 @@ final class MacOSXSysImplementation exte | |
| 78 | ||
| 79 | public boolean openURL(String url) { | |
| 80 | try { | |
| 81 | - FileManager.openURL(url); | |
| 82 | +// FileManager.openURL(url); | |
| 83 | return true; | |
| 84 | } catch (Exception e) { | |
| 85 | LWJGLUtil.log("Exception occurred while trying to invoke browser: " + e); | |
| 86 | --- a/src/java/org/lwjgl/opengl/MacOSXDisplay.java | |
| 87 | +++ b/src/java/org/lwjgl/opengl/MacOSXDisplay.java | |
| 88 | @@ -54,9 +54,9 @@ import org.lwjgl.BufferUtils; | |
| 89 | import org.lwjgl.LWJGLException; | |
| 90 | import org.lwjgl.LWJGLUtil; | |
| 91 | ||
| 92 | -import com.apple.eawt.Application; | |
| 93 | -import com.apple.eawt.ApplicationAdapter; | |
| 94 | -import com.apple.eawt.ApplicationEvent; | |
| 95 | +//import com.apple.eawt.Application; | |
| 96 | +//import com.apple.eawt.ApplicationAdapter; | |
| 97 | +//import com.apple.eawt.ApplicationEvent; | |
| 98 | ||
| 99 | import static org.lwjgl.opengl.GL11.*; | |
| 100 | ||
| 101 | @@ -79,11 +79,11 @@ final class MacOSXDisplay implements Dis | |
| 102 | try { | |
| 103 | AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() { | |
| 104 | public Object run() throws Exception { | |
| 105 | - Application.getApplication().addApplicationListener(new ApplicationAdapter() { | |
| 106 | +/* Application.getApplication().addApplicationListener(new ApplicationAdapter() { | |
| 107 | public void handleQuit(ApplicationEvent event) { | |
| 108 | doHandleQuit(); | |
| 109 | } | |
| 110 | - }); | |
| 111 | + }); */ | |
| 112 | return null; | |
| 113 | } | |
| 114 | }); |