diff options
Diffstat (limited to 'make/build.xml')
| -rwxr-xr-x | make/build.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/make/build.xml b/make/build.xml index ff28751..ec884eb 100755 --- a/make/build.xml +++ b/make/build.xml @@ -27,6 +27,8 @@ <property name="gluegen.root" value="${project.root}/../gluegen" /> <property name="gluegen.build" value="${gluegen.root}/${rootrel.build}" /> + <!-- Pull in GlueGen cpptasks build file --> + <import file="${gluegen.root}/make/gluegen-cpptasks.xml" /> <property name="joal.root" value="${project.root}/../joal" /> <property name="joal.build" value="${joal.root}/${rootrel.build}" /> @@ -60,7 +62,7 @@ </fail> </target> - <target name="init" depends="java.class.path.validate, gluegen.cpptasks.detect.os"> + <target name="init" depends="gluegen.cpptasks.detect.os, java.class.path.validate, gluegen.cpptasks.detect.os"> <property name="gluegen-rt.jar" value="${gluegen.build}/gluegen-rt.jar" /> <property name="joal.jar" value="${joal.build}/joal.jar" /> @@ -69,7 +71,7 @@ <property name="joal.demos.jar" value="${build}/joal-demos.jar" /> <property name="joal.demos.src.zip" value="${build}/joal-demos-src.zip" /> - <property name="archive.name" value="joal-demos-${joal-demos.version}" /> + <property name="archive.name" value="joal-demos-${joal-demos.version}-${os.and.arch}" /> <property name="archive" value="${build}/${archive.name}" /> <property name="obj.all.paths" value="${gluegen.build}/obj${path.separator}${joal.build}/obj" /> |