diff options
| author | Sven Gothel <[email protected]> | 2011-02-23 20:00:53 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-02-23 20:00:53 +0100 |
| commit | 355161e55d024f0009efede647e5a72a61802f58 (patch) | |
| tree | 55287b26f878e3a6240802f8b9dadc534293669a /make/build-common.xml | |
| parent | 2ac4006de0af87a87bc4f37abb3ba763379da207 (diff) | |
Adapt changes of jogamp-env.xml
Diffstat (limited to 'make/build-common.xml')
| -rw-r--r-- | make/build-common.xml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index 7b168773e..f350405c5 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -12,12 +12,11 @@ </condition> </fail> - <property environment="env" /> - <!-- 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/gluegen-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" /> @@ -33,13 +32,12 @@ <!-- - 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. --> <property name="project.root" value=".." /> <property name="build" value="${project.root}/${rootrel.build}" /> - <property name="build.path" location="${build}"/> <!-- absolute path --> <property name="src" value="${project.root}/src" /> <property name="lib" value="${build}/lib" /> <property name="jar" value="${build}/jar" /> |