diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-common.xml | 25 | ||||
| -rw-r--r-- | make/build-nativewindow.xml | 2 |
2 files changed, 18 insertions, 9 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index 29faaef20..77d81fdf7 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -205,24 +205,40 @@ <property name="jogl.all-noawt.jar" value="${build.jogl}/jogl.all-noawt.jar" /> <property name="newt.all-noawt.jar" value="${build.newt}/newt.all-noawt.jar" /> + <path id="swt_gluegen.classpath"> + <pathelement location="${gluegen-rt.jar}" /> + <pathelement location="${swt.jar}" /> + </path> + <path id="nativewindow_gluegen.classpath"> <pathelement location="${gluegen-rt.jar}" /> + <pathelement location="${swt.jar}" /> <pathelement location="${nativewindow.all.jar}" /> </path> <path id="nativewindow_gluegen_jogl.classpath"> <pathelement location="${gluegen-rt.jar}" /> + <pathelement location="${swt.jar}" /> <pathelement location="${nativewindow.all.jar}" /> <pathelement location="${jogl.all.jar}" /> </path> <path id="jogl_newt_all.classpath"> <pathelement location="${gluegen-rt.jar}" /> + <pathelement location="${swt.jar}" /> <pathelement location="${nativewindow.all.jar}" /> <pathelement location="${jogl.all.jar}" /> <pathelement location="${newt.all.jar}" /> </path> + <path id="jogl_newt_all-noawt.classpath"> + <pathelement location="${gluegen-rt.jar}" /> + <pathelement location="${swt.jar}" /> + <pathelement location="${nativewindow.all-noawt.jar}" /> + <pathelement location="${jogl.all-noawt.jar}" /> + <pathelement location="${newt.all-noawt.jar}" /> + </path> + <path id="junit_jogl_newt.compile.classpath"> <pathelement location="${junit.jar}" /> <pathelement location="${ant.jar}" /> @@ -251,11 +267,11 @@ <pathelement location="${ant.jar}" /> <pathelement location="${ant-junit.jar}" /> <pathelement location="${gluegen-rt.jar}" /> + <pathelement location="${swt.jar}" /> <pathelement location="${nativewindow.all.jar}" /> <pathelement location="${jogl.all.jar}" /> <pathelement location="${newt.event.jar}" /> <pathelement location="${jogl.test.jar}" /> - <pathelement location="${swt.jar}" /> </path> <path id="junit_jogl_newt.run.classpath"> @@ -285,13 +301,6 @@ value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${nativewindow.all.jar}${path.separator}${jogl.all.jar}${path.separator}${newt.all.jar}${path.separator}${jogl.test.jar}"/> - <path id="jogl_newt_all-noawt.classpath"> - <pathelement location="${gluegen-rt.jar}" /> - <pathelement location="${nativewindow.all-noawt.jar}" /> - <pathelement location="${jogl.all-noawt.jar}" /> - <pathelement location="${newt.all-noawt.jar}" /> - </path> - <!-- Atomic JavaSE JARS --> <property name="nativewindow.core.jar" value="${build.nativewindow}/nativewindow.core.jar" /> diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index 50ed109a2..14769d805 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -305,11 +305,11 @@ <javac destdir="${classes}" excludes="${java.excludes.all}" source="${target.sourcelevel}" - classpath="${gluegen-rt.jar}" fork="yes" includeAntRuntime="false" memoryMaximumSize="${javac.memorymax}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> + <classpath refid="swt_gluegen.classpath"/> <src path="${src.java}" /> <src path="${src.generated.java}" /> </javac> |