Fixes FTBFS on powerpc, armel and sh4. Removed trailing CRs from patches.
Gabriele Giacone
13 years ago
0 | lwjgl (2.4.2+dfsg-3) unstable; urgency=low | |
1 | ||
2 | * Fixes FTBFS on powerpc, armel and sh4. (Closes: #584985) | |
3 | * Removed trailing CRs from patches. | |
4 | ||
5 | -- Gabriele Giacone <1o5g4r8o@gmail.com> Fri, 11 Jun 2010 21:06:59 +0200 | |
6 | ||
0 | 7 | lwjgl (2.4.2+dfsg-2) unstable; urgency=low |
1 | 8 | |
2 | 9 | * Fixed clean target. Fixes FTBFS. |
0 | 0 | Description: Removes references to macosx-related classes. |
1 | 1 | Author: Gabriele Giacone <1o5g4r8o@gmail.com> |
2 | 2 | |
3 | --- a/build.xml | |
4 | +++ b/build.xml | |
5 | @@ -234,7 +234,7 @@ | |
6 | <class name="org.lwjgl.opengl.WindowsContextImplementation" /> ⏎ | |
7 | ||
8 | </javah> ⏎ | |
9 | ||
10 | ⏎ | |
11 | ||
12 | - <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes"> ⏎ | |
13 | ||
14 | +<!-- <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes"> ⏎ | |
15 | ||
16 | <class name="org.lwjgl.MacOSXSysImplementation" /> ⏎ | |
17 | ||
18 | <class name="org.lwjgl.opengl.MacOSXMouseEventQueue" /> ⏎ | |
19 | ||
20 | <class name="org.lwjgl.opengl.MacOSXCanvasPeerInfo" /> ⏎ | |
21 | ||
22 | @@ -242,7 +242,7 @@ | |
23 | <class name="org.lwjgl.opengl.MacOSXPbufferPeerInfo" /> ⏎ | |
24 | ||
25 | <class name="org.lwjgl.opengl.MacOSXDisplay" /> ⏎ | |
26 | ||
27 | <class name="org.lwjgl.opengl.MacOSXContextImplementation" /> ⏎ | |
28 | ||
29 | - </javah> ⏎ | |
30 | ||
31 | + </javah> --> ⏎ | |
32 | ||
33 | ⏎ | |
34 | ||
35 | <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}" force="yes"> ⏎ | |
36 | ||
37 | <class name="org.lwjgl.opengl.AWTSurfaceLock" /> ⏎ | |
38 | ||
39 | @@ -298,13 +298,13 @@ | |
40 | </tokenfilter> ⏎ | |
41 | ||
42 | </filterchain> ⏎ | |
43 | ||
44 | </loadfile> ⏎ | |
45 | ||
46 | - <loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version"> ⏎ | |
47 | ||
48 | +<!-- <loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version"> ⏎ | |
49 | ||
50 | <filterchain> ⏎ | |
51 | ||
52 | <tokenfilter> ⏎ | |
53 | ||
54 | <containsstring contains="#define org_lwjgl_MacOSXSysImplementation_JNI_VERSION"/> ⏎ | |
55 | ||
56 | </tokenfilter> ⏎ | |
57 | ||
58 | </filterchain> ⏎ | |
59 | ||
60 | - </loadfile> ⏎ | |
61 | ||
62 | + </loadfile> --> ⏎ | |
63 | ||
64 | <echo> ⏎ | |
65 | ||
66 | lwjgl.java.windows.version = ${lwjgl.java.windows.version} ⏎ | |
67 | ||
68 | lwjgl.native.windows.version = ${lwjgl.native.windows.version} ⏎ | |
69 | ||
70 | --- a/platform_build/build-applet.xml | |
71 | +++ b/platform_build/build-applet.xml | |
72 | @@ -1,7 +1,7 @@ | |
73 | <project name="applet"> ⏎ | |
74 | ||
75 | ⏎ | |
76 | ||
77 | <!-- Create our packer task --> ⏎ | |
78 | ||
79 | - <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/> ⏎ | |
80 | ||
81 | +<!-- <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/> --> ⏎ | |
82 | ||
83 | ⏎ | |
84 | ||
85 | <target name="applet" depends="all"> ⏎ | |
86 | ||
87 | <antcall target="-applet"> ⏎ | |
88 | ||
89 | --- a/src/java/org/lwjgl/MacOSXSysImplementation.java | |
90 | +++ b/src/java/org/lwjgl/MacOSXSysImplementation.java | |
91 | @@ -33,7 +33,7 @@ package org.lwjgl; | |
92 | ⏎ | |
93 | ||
94 | import java.awt.Toolkit; ⏎ | |
95 | ||
96 | ⏎ | |
97 | ||
98 | -import com.apple.eio.FileManager; ⏎ | |
99 | ||
100 | +//import com.apple.eio.FileManager; ⏎ | |
101 | ||
102 | ⏎ | |
103 | ||
104 | /** ⏎ | |
105 | ||
106 | * ⏎ | |
107 | ||
108 | @@ -55,7 +55,7 @@ final class MacOSXSysImplementation extends J2SESysImplementation { | |
109 | ⏎ | |
110 | ||
111 | public boolean openURL(String url) { ⏎ | |
112 | ||
113 | try { ⏎ | |
114 | ||
115 | - FileManager.openURL(url); ⏎ | |
116 | ||
117 | +// FileManager.openURL(url); ⏎ | |
118 | ||
119 | return true; ⏎ | |
120 | ||
121 | } catch (Exception e) { ⏎ | |
122 | ||
123 | LWJGLUtil.log("Exception occurred while trying to invoke browser: " + e); ⏎ | |
124 | ||
125 | --- a/src/java/org/lwjgl/opengl/MacOSXDisplay.java | |
126 | +++ b/src/java/org/lwjgl/opengl/MacOSXDisplay.java | |
127 | @@ -54,9 +54,9 @@ import org.lwjgl.BufferUtils; | |
128 | import org.lwjgl.LWJGLException; ⏎ | |
129 | ||
130 | import org.lwjgl.LWJGLUtil; ⏎ | |
131 | ||
132 | ⏎ | |
133 | ||
134 | -import com.apple.eawt.Application; ⏎ | |
135 | ||
136 | -import com.apple.eawt.ApplicationAdapter; ⏎ | |
137 | ||
138 | -import com.apple.eawt.ApplicationEvent; ⏎ | |
139 | ||
140 | +//import com.apple.eawt.Application; ⏎ | |
141 | ||
142 | +//import com.apple.eawt.ApplicationAdapter; ⏎ | |
143 | ||
144 | +//import com.apple.eawt.ApplicationEvent; ⏎ | |
145 | ||
146 | ⏎ | |
147 | ||
148 | final class MacOSXDisplay implements DisplayImplementation { ⏎ | |
149 | ||
150 | private static final int PBUFFER_HANDLE_SIZE = 24; ⏎ | |
151 | ||
152 | @@ -77,11 +77,11 @@ final class MacOSXDisplay implements DisplayImplementation { | |
153 | try { ⏎ | |
154 | ||
155 | AccessController.doPrivileged(new PrivilegedExceptionAction() { ⏎ | |
156 | ||
157 | public Object run() throws Exception { ⏎ | |
158 | ||
159 | - Application.getApplication().addApplicationListener(new ApplicationAdapter() { ⏎ | |
160 | ||
161 | +/* Application.getApplication().addApplicationListener(new ApplicationAdapter() { ⏎ | |
162 | ||
163 | public final void handleQuit(ApplicationEvent event) { ⏎ | |
164 | ||
165 | doHandleQuit(); ⏎ | |
166 | ||
167 | } ⏎ | |
168 | ||
169 | - }); ⏎ | |
170 | ||
171 | + }); */ ⏎ | |
172 | ||
173 | return null; ⏎ | |
174 | ||
175 | } ⏎ | |
176 | ||
177 | }); ⏎ | |
178 | ||
3 | --- a/build.xml | |
4 | +++ b/build.xml | |
5 | @@ -234,7 +234,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 | @@ -242,7 +242,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 | @@ -298,13 +298,13 @@ | |
24 | </tokenfilter> | |
25 | </filterchain> | |
26 | </loadfile> | |
27 | - <loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version"> | |
28 | +<!-- <loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version"> | |
29 | <filterchain> | |
30 | <tokenfilter> | |
31 | <containsstring contains="#define org_lwjgl_MacOSXSysImplementation_JNI_VERSION"/> | |
32 | </tokenfilter> | |
33 | </filterchain> | |
34 | - </loadfile> | |
35 | + </loadfile> --> | |
36 | <echo> | |
37 | lwjgl.java.windows.version = ${lwjgl.java.windows.version} | |
38 | lwjgl.native.windows.version = ${lwjgl.native.windows.version} | |
39 | --- a/platform_build/build-applet.xml | |
40 | +++ b/platform_build/build-applet.xml | |
41 | @@ -1,7 +1,7 @@ | |
42 | <project name="applet"> | |
43 | ||
44 | <!-- Create our packer task --> | |
45 | - <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/> | |
46 | +<!-- <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/> --> | |
47 | ||
48 | <target name="applet" depends="all"> | |
49 | <antcall target="-applet"> | |
50 | --- a/src/java/org/lwjgl/MacOSXSysImplementation.java | |
51 | +++ b/src/java/org/lwjgl/MacOSXSysImplementation.java | |
52 | @@ -33,7 +33,7 @@ | |
53 | ||
54 | import java.awt.Toolkit; | |
55 | ||
56 | -import com.apple.eio.FileManager; | |
57 | +//import com.apple.eio.FileManager; | |
58 | ||
59 | /** | |
60 | * | |
61 | @@ -55,7 +55,7 @@ | |
62 | ||
63 | public boolean openURL(String url) { | |
64 | try { | |
65 | - FileManager.openURL(url); | |
66 | +// FileManager.openURL(url); | |
67 | return true; | |
68 | } catch (Exception e) { | |
69 | LWJGLUtil.log("Exception occurred while trying to invoke browser: " + e); | |
70 | --- a/src/java/org/lwjgl/opengl/MacOSXDisplay.java | |
71 | +++ b/src/java/org/lwjgl/opengl/MacOSXDisplay.java | |
72 | @@ -54,9 +54,9 @@ | |
73 | import org.lwjgl.LWJGLException; | |
74 | import org.lwjgl.LWJGLUtil; | |
75 | ||
76 | -import com.apple.eawt.Application; | |
77 | -import com.apple.eawt.ApplicationAdapter; | |
78 | -import com.apple.eawt.ApplicationEvent; | |
79 | +//import com.apple.eawt.Application; | |
80 | +//import com.apple.eawt.ApplicationAdapter; | |
81 | +//import com.apple.eawt.ApplicationEvent; | |
82 | ||
83 | final class MacOSXDisplay implements DisplayImplementation { | |
84 | private static final int PBUFFER_HANDLE_SIZE = 24; | |
85 | @@ -77,11 +77,11 @@ | |
86 | try { | |
87 | AccessController.doPrivileged(new PrivilegedExceptionAction() { | |
88 | public Object run() throws Exception { | |
89 | - Application.getApplication().addApplicationListener(new ApplicationAdapter() { | |
90 | +/* Application.getApplication().addApplicationListener(new ApplicationAdapter() { | |
91 | public final void handleQuit(ApplicationEvent event) { | |
92 | doHandleQuit(); | |
93 | } | |
94 | - }); | |
95 | + }); */ | |
96 | return null; | |
97 | } | |
98 | }); |
0 | Description: To build on all archs | |
1 | Author: Gabriele Giacone <1o5g4r8o@gmail.com> | |
2 | ||
3 | --- a/platform_build/linux_ant/build.xml | |
4 | +++ b/platform_build/linux_ant/build.xml | |
5 | @@ -1,17 +1,22 @@ | |
6 | <?xml version="1.0"?> | |
7 | ||
8 | <project name="lwjgl native code, linux" basedir="../../bin/lwjgl" default="compile"> | |
9 | + <exec executable="/usr/bin/dpkg-architecture" outputproperty="arch"> | |
10 | + <arg value="-qDEB_BUILD_ARCH"/> | |
11 | + </exec> | |
12 | <property name="native" location="../../src/native"/> | |
13 | <property name="libname32" value="liblwjgl.so"/> | |
14 | <property name="libname64" value="liblwjgl64.so"/> | |
15 | <property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt" /> | |
16 | <property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/amd64 -ljawt" /> | |
17 | + <property name="libs" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/${arch} -ljawt" /> | |
18 | <property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/> | |
19 | ||
20 | <target name="clean"> | |
21 | <delete> | |
22 | <fileset dir="x32"/> | |
23 | <fileset dir="x64"/> | |
24 | + <fileset dir="deb"/> | |
25 | <fileset dir="." includes="*.o"/> | |
26 | <fileset dir="." includes="*.so"/> | |
27 | </delete> | |
28 | @@ -41,6 +46,7 @@ | |
29 | ||
30 | <property name="linker_flags32" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs32} ${xf86vm_lib}"/> | |
31 | <property name="linker_flags64" value="${version_script_flags64} -shared -O2 -Wall -o ${libname64} ${libs64} ${xf86vm_lib}"/> | |
32 | + <property name="linker_flagsdeb" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs} ${xf86vm_lib}"/> | |
33 | ||
34 | <condition property="build.32bit.only"> | |
35 | <not> | |
36 | @@ -58,9 +64,12 @@ | |
37 | <equals arg1="${hwplatform}" arg2="x86_64"/> | |
38 | </and> | |
39 | </condition> | |
40 | + | |
41 | + <condition property="build.debian"> | |
42 | + <os name="Linux"/> | |
43 | + </condition> | |
44 | ||
45 | - <antcall target="compile32"/> | |
46 | - <antcall target="compile64"/> | |
47 | + <antcall target="compiledeb"/> | |
48 | </target> | |
49 | ||
50 | <target name="compile32" unless="build.64bit.only"> | |
51 | @@ -114,4 +123,30 @@ | |
52 | <fileset file="${libname64}"/> | |
53 | </apply> | |
54 | </target> | |
55 | + | |
56 | + <target name="compiledeb"> | |
57 | + <mkdir dir="deb"/> | |
58 | + <apply dir="deb" executable="gcc" skipemptyfilesets="true" failonerror="true"> | |
59 | + <arg line="${cflags32} ${cflags_pthread}"/> | |
60 | + <arg value="-I${java.home}/include"/> | |
61 | + <arg value="-I${java.home}/include/linux"/> | |
62 | + <arg value="-I${java.home}/../include"/> | |
63 | + <arg value="-I${java.home}/../include/linux"/> | |
64 | + <arg value="-I${java.home}/../include/solaris"/> | |
65 | + <arg value="-I${native}/common"/> | |
66 | + <arg value="-I${native}/linux"/> | |
67 | + <mapper type="glob" from="*.c" to="*.o"/> | |
68 | + <fileset dir="${native}/linux" includes="*.c"/> | |
69 | + <fileset dir="${native}/generated" includes="*.c"/> | |
70 | + <fileset dir="${native}/common" includes="*.c"/> | |
71 | + </apply> | |
72 | + <apply dir="." parallel="true" executable="gcc" failonerror="true"> | |
73 | + <srcfile/> | |
74 | + <arg line="${linker_flagsdeb}"/> | |
75 | + <fileset dir="deb" includes="*.o"/> | |
76 | + </apply> | |
77 | + <apply dir="." parallel="true" executable="strip" failonerror="true"> | |
78 | + <fileset file="${libname32}"/> | |
79 | + </apply> | |
80 | + </target> | |
81 | </project> | |
0 | Description: To build on all archs | |
1 | Author: Gabriele Giacone <1o5g4r8o@gmail.com> | |
2 | ||
3 | --- a/platform_build/linux_ant/build.xml | |
4 | +++ b/platform_build/linux_ant/build.xml | |
5 | @@ -6,12 +6,14 @@ | |
6 | <property name="libname64" value="liblwjgl64.so"/> | |
7 | <property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt" /> | |
8 | <property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/amd64 -ljawt" /> | |
9 | + <property name="libs" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/${os.arch} -ljawt" /> | |
10 | <property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/> | |
11 | ||
12 | <target name="clean"> | |
13 | <delete> | |
14 | <fileset dir="x32"/> | |
15 | <fileset dir="x64"/> | |
16 | + <fileset dir="deb"/> | |
17 | <fileset dir="." includes="*.o"/> | |
18 | <fileset dir="." includes="*.so"/> | |
19 | </delete> | |
20 | @@ -41,6 +43,7 @@ | |
21 | ||
22 | <property name="linker_flags32" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs32} ${xf86vm_lib}"/> | |
23 | <property name="linker_flags64" value="${version_script_flags64} -shared -O2 -Wall -o ${libname64} ${libs64} ${xf86vm_lib}"/> | |
24 | + <property name="linker_flagsdeb" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs} ${xf86vm_lib}"/> | |
25 | ||
26 | <condition property="build.32bit.only"> | |
27 | <not> | |
28 | @@ -58,9 +61,12 @@ | |
29 | <equals arg1="${hwplatform}" arg2="x86_64"/> | |
30 | </and> | |
31 | </condition> | |
32 | + | |
33 | + <condition property="build.debian"> | |
34 | + <os name="Linux"/> | |
35 | + </condition> | |
36 | ||
37 | - <antcall target="compile32"/> | |
38 | - <antcall target="compile64"/> | |
39 | + <antcall target="compiledeb"/> | |
40 | </target> | |
41 | ||
42 | <target name="compile32" unless="build.64bit.only"> | |
43 | @@ -114,4 +120,30 @@ | |
44 | <fileset file="${libname64}"/> | |
45 | </apply> | |
46 | </target> | |
47 | + | |
48 | + <target name="compiledeb"> | |
49 | + <mkdir dir="deb"/> | |
50 | + <apply dir="deb" executable="gcc" skipemptyfilesets="true" failonerror="true"> | |
51 | + <arg line="${cflags32} ${cflags_pthread}"/> | |
52 | + <arg value="-I${java.home}/include"/> | |
53 | + <arg value="-I${java.home}/include/linux"/> | |
54 | + <arg value="-I${java.home}/../include"/> | |
55 | + <arg value="-I${java.home}/../include/linux"/> | |
56 | + <arg value="-I${java.home}/../include/solaris"/> | |
57 | + <arg value="-I${native}/common"/> | |
58 | + <arg value="-I${native}/linux"/> | |
59 | + <mapper type="glob" from="*.c" to="*.o"/> | |
60 | + <fileset dir="${native}/linux" includes="*.c"/> | |
61 | + <fileset dir="${native}/generated" includes="*.c"/> | |
62 | + <fileset dir="${native}/common" includes="*.c"/> | |
63 | + </apply> | |
64 | + <apply dir="." parallel="true" executable="gcc" failonerror="true"> | |
65 | + <srcfile/> | |
66 | + <arg line="${linker_flagsdeb}"/> | |
67 | + <fileset dir="deb" includes="*.o"/> | |
68 | + </apply> | |
69 | + <apply dir="." parallel="true" executable="strip" failonerror="true"> | |
70 | + <fileset file="${libname32}"/> | |
71 | + </apply> | |
72 | + </target> | |
73 | </project> |
0 | 0 | Description: To find system jinput libraries |
1 | 1 | Author: Gabriele Giacone <1o5g4r8o@gmail.com> |
2 | 2 | |
3 | --- a/build.xml | |
4 | +++ b/build.xml | |
5 | @@ -340,7 +340,7 @@ | |
6 | ⏎ | |
7 | ||
8 | <!-- Compiles the Java source code --> ⏎ | |
9 | ||
10 | <target name="compile" description="Compiles the java source code" depends="-initialize"> ⏎ | |
11 | ||
12 | - <javac debug="yes" destdir="${lwjgl.bin}" source="1.4" target="1.4" classpath="${lwjgl.lib}/jinput.jar:${lwjgl.lib}/AppleJavaExtensions.jar" taskname="core"> ⏎ | |
13 | ||
14 | + <javac debug="yes" destdir="${lwjgl.bin}" source="1.4" target="1.4" classpath="/usr/share/java/jinput.jar:/usr/share/java/jutils.jar:${lwjgl.lib}/AppleJavaExtensions.jar" taskname="core"> ⏎ | |
15 | ||
16 | <src path="${lwjgl.src}/java/"/> ⏎ | |
17 | ||
18 | <src path="${lwjgl.src}/generated/"/> ⏎ | |
19 | ||
20 | <include name="org/lwjgl/*.java"/> ⏎ | |
21 | ||
22 | @@ -481,7 +481,7 @@ | |
23 | <os name="Mac OS X" /> ⏎ | |
24 | ||
25 | </condition> ⏎ | |
26 | ||
27 | <property name="native_path_expanded" location="${native_path}"/> ⏎ | |
28 | ||
29 | - <java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:${lwjgl.lib}/jinput.jar" fork="true"> ⏎ | |
30 | ||
31 | + <java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:/usr/share/java/jinput.jar:/usr/share/java/jutils.jar" fork="true"> ⏎ | |
32 | ||
33 | <sysproperty key="org.lwjgl.util.Debug" value="true"/> ⏎ | |
34 | ||
35 | <sysproperty key="java.library.path" value="${native_path_expanded}"/> ⏎ | |
36 | ||
37 | <arg line="${args}"/> ⏎ | |
38 | ||
3 | --- a/build.xml | |
4 | +++ b/build.xml | |
5 | @@ -340,7 +340,7 @@ | |
6 | ||
7 | <!-- Compiles the Java source code --> | |
8 | <target name="compile" description="Compiles the java source code" depends="-initialize"> | |
9 | - <javac debug="yes" destdir="${lwjgl.bin}" source="1.4" target="1.4" classpath="${lwjgl.lib}/jinput.jar:${lwjgl.lib}/AppleJavaExtensions.jar" taskname="core"> | |
10 | + <javac debug="yes" destdir="${lwjgl.bin}" source="1.4" target="1.4" classpath="/usr/share/java/jinput.jar:/usr/share/java/jutils.jar:${lwjgl.lib}/AppleJavaExtensions.jar" taskname="core"> | |
11 | <src path="${lwjgl.src}/java/"/> | |
12 | <src path="${lwjgl.src}/generated/"/> | |
13 | <include name="org/lwjgl/*.java"/> | |
14 | @@ -481,7 +481,7 @@ | |
15 | <os name="Mac OS X" /> | |
16 | </condition> | |
17 | <property name="native_path_expanded" location="${native_path}"/> | |
18 | - <java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:${lwjgl.lib}/jinput.jar" fork="true"> | |
19 | + <java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:/usr/share/java/jinput.jar:/usr/share/java/jutils.jar" fork="true"> | |
20 | <sysproperty key="org.lwjgl.util.Debug" value="true"/> | |
21 | <sysproperty key="java.library.path" value="${native_path_expanded}"/> | |
22 | <arg line="${args}"/> |