diff options
| author | Sven Gothel <[email protected]> | 2011-02-23 19:45:59 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-02-23 19:45:59 +0100 |
| commit | 3a1658a3e98abec4d74d68e4b4768982b9f31aff (patch) | |
| tree | 0a3eecb6ea98cbee6ca67560e421e737caf081c9 /make | |
| parent | 34fc1a7b38c2ab281200d84712a045f03f7c9b13 (diff) | |
Adapt changes of jogamp-env.xml
Diffstat (limited to 'make')
| -rwxr-xr-x | make/build.xml | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | make/scripts/make.joal-demos.all.linux-x86_64.sh | 0 |
2 files changed, 2 insertions, 4 deletions
diff --git a/make/build.xml b/make/build.xml index b421b28..5600ebb 100755 --- a/make/build.xml +++ b/make/build.xml @@ -30,6 +30,7 @@ <!-- Pull in GlueGen cpptasks build file --> <import file="${gluegen.root}/make/gluegen-cpptasks.xml" /> <import file="${gluegen.root}/make/gluegen-archivetasks.xml" /> + <import file="${gluegen.root}/make/jogamp-env.xml" /> <property name="joal.root" value="${project.root}/../joal" /> <property name="joal.build" value="${joal.root}/${rootrel.build}" /> @@ -40,9 +41,6 @@ <property name="joal-demos.build.branch" value="master"/> <property name="joal-demos.build.commit" value="manual"/> - <!-- Pull in GlueGen cpptasks build file --> - <import file="${gluegen.root}/make/gluegen-cpptasks.xml" /> - <!-- - Make sure that joal-demos.jar is not on the CLASSPATH; this can - cause builds to fail since if this Java process has the jar file @@ -63,7 +61,7 @@ </fail> </target> - <target name="init" depends="gluegen.cpptasks.detect.os, java.class.path.validate, gluegen.cpptasks.detect.os"> + <target name="init" depends="jogamp.env.init, 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" /> diff --git a/make/scripts/make.joal-demos.all.linux-x86_64.sh b/make/scripts/make.joal-demos.all.linux-x86_64.sh index 746cf2d..746cf2d 100644..100755 --- a/make/scripts/make.joal-demos.all.linux-x86_64.sh +++ b/make/scripts/make.joal-demos.all.linux-x86_64.sh |