summaryrefslogtreecommitdiffstats
path: root/make/build.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2011-02-23 19:43:12 +0100
committerSven Gothel <[email protected]>2011-02-23 19:43:12 +0100
commit4ee45807bf9e643dc75b24e48b68981547257947 (patch)
tree75ddc123845d600a9b44c5d3b339558d5a480d9e /make/build.xml
parentec507c11ef64de269248b7b9dafceece7f08f56b (diff)
Adapt changes of jogamp-env.xml
Diffstat (limited to 'make/build.xml')
-rwxr-xr-xmake/build.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/make/build.xml b/make/build.xml
index 4caf436..5a3bc6a 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -38,7 +38,6 @@
</tstamp>
<property name="joal.version" value="${joal_base_version}-${version.timestamp}" />
- <property environment="env" />
<property name="project.root" value=".." />
<condition property="rootrel.build" value="build">
@@ -60,6 +59,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" />
<!-- ================================================================== -->
<!--
@@ -78,7 +78,7 @@
<!--
- Declare all paths and user defined variables.
-->
- <target name="init" depends="gluegen.cpptasks.detect.os">
+ <target name="init" depends="jogamp.env.init, gluegen.cpptasks.detect.os">
<!-- The location and name of the configuration ANT file that will
- validate to ensure that all user-define variables are set. -->