From 51981d1fdb8e8056db9bbba6f1714f2f4c1cd6bc Mon Sep 17 00:00:00 2001
From: sg215889 <sg215889@jordan.goethel.localnet>
Date: Sat, 25 Jul 2009 23:30:21 -0700
Subject: Newt: useKD optional again; macosx jar fix

---
 make/build-newt.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'make/build-newt.xml')

diff --git a/make/build-newt.xml b/make/build-newt.xml
index 4895318e0..a28a3188f 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -98,9 +98,7 @@
         </condition>
 
         <condition property="useKD">
-            <not>
-                <isset property="${setup.noOpenGL}" />
-            </not>
+            <isset property="${setup.useKD}" />
         </condition>
 
         <condition property="setup.nonatives">
@@ -710,7 +708,7 @@
         </jar>
         <jar manifest="tempversion" destfile="${newt.osx.jar}">
             <fileset dir="${classes}"
-                     includes="${java.part.osx}"/>
+                     includes="${java.part.macosx}"/>
         </jar>
     </target>
 
@@ -725,7 +723,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>
 
-- 
cgit v1.2.3


From 30e7b4af033598ffea6ddff051aa937bb50e1ad9 Mon Sep 17 00:00:00 2001
From: sg215889 <sg215889@jordan.goethel.localnet>
Date: Sun, 26 Jul 2009 00:29:38 -0700
Subject: Fix: Add gluegen.cpptasks.detect.os call

---
 make/build-jogl.xml         | 2 +-
 make/build-nativewindow.xml | 2 +-
 make/build-newt.xml         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'make/build-newt.xml')

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index c48745da7..b23aee60c 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -75,7 +75,7 @@
     <!-- 
        - Base initialization and detection of operating system.
       -->
-    <target name="base.init">
+    <target name="base.init" depends="gluegen.cpptasks.detect.os">
 
         <condition property="setup.noAWT">
             <and>
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index 79e6b93ae..fa1dfe696 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -66,7 +66,7 @@
     <!-- 
        - Base initialization and detection of operating system.
       -->
-    <target name="base.init">
+    <target name="base.init" depends="gluegen.cpptasks.detect.os">
 
         <condition property="setup.noAWT">
             <and>
diff --git a/make/build-newt.xml b/make/build-newt.xml
index a28a3188f..fc8bd1f00 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"/>
 
-- 
cgit v1.2.3