summaryrefslogtreecommitdiffstats
path: root/make/build-newt.xml
diff options
context:
space:
mode:
authorMorris Meyer <[email protected]>2009-07-27 14:34:40 -0400
committerMorris Meyer <[email protected]>2009-07-27 14:34:40 -0400
commit1b390d8cc911045e6cf8b581cc897b6da1f39f92 (patch)
treefa9b45cefe8905707b5878cbbda55af964c74482 /make/build-newt.xml
parent90beaae660222f1fb5ca15313f8e4645d3fd30fe (diff)
parent30e7b4af033598ffea6ddff051aa937bb50e1ad9 (diff)
Merge branch 'MIPS_PORT' of ssh://[email protected]/jogl~jogl-git into MIPS_PORT
Diffstat (limited to 'make/build-newt.xml')
-rw-r--r--make/build-newt.xml10
1 files changed, 4 insertions, 6 deletions
diff --git a/make/build-newt.xml b/make/build-newt.xml
index ee4b6ee17..31a23172a 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -69,7 +69,7 @@
<!--
- Base initialization and detection of operating system.
-->
- <target name="base.init">
+ <target name="base.init" depends="gluegen.cpptasks.detect.os">
<property name="javac.bootclasspath-cdc.jar" value="../../gluegen/make/lib/cdc_fp.jar"/>
@@ -98,9 +98,7 @@
</condition>
<condition property="useKD">
- <not>
- <isset property="${setup.noOpenGL}" />
- </not>
+ <isset property="${setup.useKD}" />
</condition>
<condition property="setup.nonatives">
@@ -708,7 +706,7 @@
</jar>
<jar manifest="tempversion" destfile="${newt.osx.jar}">
<fileset dir="${classes}"
- includes="${java.part.osx}"/>
+ includes="${java.part.macosx}"/>
</jar>
</target>
@@ -723,7 +721,7 @@
</jar>
<jar manifest="tempversion-cdc" destfile="${newt.osx.cdc.jar}">
<fileset dir="${classes-cdc}"
- includes="${java.part.osx}"/>
+ includes="${java.part.macosx}"/>
</jar>
</target>