diff options
Diffstat (limited to 'make/build-common.xml')
| -rw-r--r-- | make/build-common.xml | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index 29faaef20..eb1162186 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -15,6 +15,8 @@ <!-- Pull in GlueGen cpptasks build file --> <property name="gluegen.root" value="../../gluegen" /> <import file="${gluegen.root}/make/gluegen-cpptasks.xml" /> + <import file="${gluegen.root}/make/jogamp-archivetasks.xml" /> + <import file="${gluegen.root}/make/jogamp-env.xml" /> <property name="ant-contrib.jar" value="${gluegen.root}/make/lib/ant-contrib-1.0b3.jar" /> @@ -30,7 +32,7 @@ <!-- - Base initialization of properties and detection of operating system. --> - <target name="common.init" depends="gluegen.cpptasks.detect.os" unless="common.init.done"> + <target name="common.init" depends="jogamp.env.init, gluegen.cpptasks.detect.os" unless="common.init.done"> <property name="common.init.done" value="true" /> <!-- Set the project root directory to be up one directory. --> @@ -205,24 +207,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 +269,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 +303,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" /> |