diff options
Diffstat (limited to 'make/build-newt.xml')
| -rw-r--r-- | make/build-newt.xml | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/make/build-newt.xml b/make/build-newt.xml index 48674f1ac..ad04973e4 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -62,9 +62,6 @@ <property name="gluegen.root" value="../../gluegen" /> <import file="${gluegen.root}/make/gluegen-cpptasks.xml" /> - <available file="${user.home}/newt.compiler.xml" property="newt.compiler.present"/> - <import file="${user.home}/newt.compiler.xml" optional="true" /> - <!-- ================================================================== --> <!-- - Base initialization and detection of operating system. @@ -349,7 +346,7 @@ - Compile the native C code for JOGL (and optionally the Cg binding). --> - <target name="c.configure.1" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler" unless="newt.compiler.present"> + <target name="c.configure.1" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler"> <!-- compiler configuration --> <!-- Note that we can use the base setups in the gluegen-cpptasks for most of these --> @@ -424,12 +421,10 @@ <echo message="Linux.x86" /> <property name="compiler.cfg.id" value="compiler.cfg.linux" /> <property name="linker.cfg.id.core" value="linker.cfg.linux" /> - <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" > + <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" + else="linker.cfg.linux"> <isset property="isX11" /> </condition> - <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.newt.broadcom_egl" > - <isset property="useBroadcomEGL" /> - </condition> <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> </target> @@ -437,7 +432,11 @@ <echo message="Linux.AMD64" /> <property name="compiler.cfg.id" value="compiler.cfg.linux.amd64" /> <property name="linker.cfg.id.core" value="linker.cfg.linux.amd64" /> - <property name="linker.cfg.id.oswin" value="linker.cfg.linux.amd64.newt.x11" /> + <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.amd64.newt.x11" + else="linker.cfg.linux.amd64"> + <isset property="isX11" /> + </condition> + <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> </target> <target name="c.configure.linux.ia64" if="isLinuxIA64"> @@ -447,7 +446,7 @@ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" /> </target> - <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.x11" if="isLinux" /> + <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.x11" if="isLinux"/> <target name="c.configure.solaris32" depends="c.configure.x11" if="isSolaris32Bit"> <echo message="Solaris" /> |