Commit 43a6d54
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,26 +1,21 @@ | |||
| 1 | - <?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | - <classpath> | ||
| 3 | - <classpathentry kind="src" path="src"/> | ||
| 4 | - <classpathentry kind="src" path="generated"/> | ||
| 5 | - <classpathentry kind="src" path="test/src"/> | ||
| 6 | - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> | ||
| 7 | - <classpathentry combineaccessrules="false" kind="src" path="/processing-core"/> | ||
| 8 | - <classpathentry combineaccessrules="false" kind="src" path="/processing-dxf"/> | ||
| 9 | - <classpathentry combineaccessrules="false" kind="src" path="/processing-net"/> | ||
| 10 | - <classpathentry combineaccessrules="false" kind="src" path="/processing-opengl"> | ||
| 11 | - <attributes> | ||
| 12 | - <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="opengl/library"/> | ||
| 13 | - </attributes> | ||
| 14 | - </classpathentry> | ||
| 15 | - <classpathentry combineaccessrules="false" kind="src" path="/processing-pdf"/> | ||
| 16 | - <classpathentry combineaccessrules="false" kind="src" path="/processing-serial"/> | ||
| 17 | - <classpathentry combineaccessrules="false" kind="src" path="/processing-video"/> | ||
| 18 | - <classpathentry kind="lib" path="lib/antlr.jar" sourcepath="lib/antlr-src.zip"/> | ||
| 19 | - <classpathentry kind="lib" path="lib/jna.jar"/> | ||
| 20 | - <classpathentry kind="lib" path="lib/ecj.jar"/> | ||
| 21 | - <classpathentry exported="true" kind="lib" path="lib/ant.jar"/> | ||
| 22 | - <classpathentry exported="true" kind="lib" path="lib/ant-launcher.jar"/> | ||
| 23 | - <classpathentry kind="lib" path="lib/apple.jar"/> | ||
| 24 | - <classpathentry kind="lib" path="test/lib/junit-4.8.1.jar"/> | ||
| 25 | - <classpathentry kind="output" path="bin"/> | ||
| 26 | - </classpath> | ||
| 1 | + <?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | + <classpath> | ||
| 3 | + <classpathentry kind="src" path="src"/> | ||
| 4 | + <classpathentry kind="src" path="generated"/> | ||
| 5 | + <classpathentry kind="src" path="test/src"/> | ||
| 6 | + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> | ||
| 7 | + <classpathentry combineaccessrules="false" kind="src" path="/processing-core"/> | ||
| 8 | + <classpathentry combineaccessrules="false" kind="src" path="/processing-dxf"/> | ||
| 9 | + <classpathentry combineaccessrules="false" kind="src" path="/processing-net"/> | ||
| 10 | + <classpathentry combineaccessrules="false" kind="src" path="/processing-pdf"/> | ||
| 11 | + <classpathentry combineaccessrules="false" kind="src" path="/processing-serial"/> | ||
| 12 | + <classpathentry combineaccessrules="false" kind="src" path="/processing-video"/> | ||
| 13 | + <classpathentry kind="lib" path="lib/antlr.jar" sourcepath="lib/antlr-src.zip"/> | ||
| 14 | + <classpathentry kind="lib" path="lib/jna.jar"/> | ||
| 15 | + <classpathentry kind="lib" path="lib/ecj.jar"/> | ||
| 16 | + <classpathentry exported="true" kind="lib" path="lib/ant.jar"/> | ||
| 17 | + <classpathentry exported="true" kind="lib" path="lib/ant-launcher.jar"/> | ||
| 18 | + <classpathentry kind="lib" path="lib/apple.jar"/> | ||
| 19 | + <classpathentry kind="lib" path="test/lib/junit-4.8.1.jar"/> | ||
| 20 | + <classpathentry kind="output" path="bin"/> | ||
| 21 | + </classpath> | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -2,5 +2,7 @@ | |||
| 2 | 2 | <classpath> | |
| 3 | 3 | <classpathentry kind="src" path="src"/> | |
| 4 | 4 | <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> | |
| 5 | + <classpathentry kind="lib" path="library/jogl.all.jar"/> | ||
| 6 | + <classpathentry kind="lib" path="library/gluegen-rt.jar"/> | ||
| 5 | 7 | <classpathentry kind="output" path="bin"/> | |
| 6 | 8 | </classpath> | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -17,11 +17,19 @@ | |||
| 17 | 17 | encoding="UTF-8" | |
| 18 | 18 | includeAntRuntime="false" | |
| 19 | 19 | debug="true" | |
| 20 | - srcdir="src" destdir="bin" /> | ||
| 20 | + srcdir="src" destdir="bin" | ||
| 21 | + classpath="library/jogl.all.jar; library/gluegen-rt.jar" /> | ||
| 21 | 22 | ||
| 22 | - <!-- copy the jnilib to the bin folder so it's included --> | ||
| 23 | + <!-- Copy the jnilib to the bin folder so it's included. --> | ||
| 23 | 24 | <copy todir="bin/japplemenubar" | |
| 24 | 25 | file="src/japplemenubar/libjAppleMenuBar.jnilib" /> | |
| 26 | + | ||
| 27 | + <!-- Copy shaders to bin. (Eclipse does this automatically.) --> | ||
| 28 | + <copy todir="bin"> | ||
| 29 | + <fileset dir="src"> | ||
| 30 | + <include name="processing/opengl/*.glsl" /> | ||
| 31 | + </fileset> | ||
| 32 | + </copy> | ||
| 25 | 33 | </target> | |
| 26 | 34 | ||
| 27 | 35 | <target name="build" depends="compile" description="Build core library"> | |
0 commit comments