From bd6a4471952d8d788ba613d9d5e3fc4c1adb3f0f Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 23 Feb 2011 20:04:37 +0100
Subject: Adapt changes of jogamp-env.xml

---
 make/build.xml                         | 3 ++-
 make/scripts/make.jogl.all.macosx.sh   | 0
 make/scripts/make.jogl.all.win32.bat   | 0
 make/scripts/make.jogl.all.win64.bat   | 0
 make/scripts/make.jogl.all.x86.sh      | 0
 make/scripts/make.jogl.all.x86_64.sh   | 0
 make/scripts/make.jogl.cdcfp.macosx.sh | 0
 make/scripts/make.jogl.cdcfp.x86.sh    | 0
 8 files changed, 2 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 make/scripts/make.jogl.all.macosx.sh
 mode change 100644 => 100755 make/scripts/make.jogl.all.win32.bat
 mode change 100644 => 100755 make/scripts/make.jogl.all.win64.bat
 mode change 100644 => 100755 make/scripts/make.jogl.all.x86.sh
 mode change 100644 => 100755 make/scripts/make.jogl.all.x86_64.sh
 mode change 100644 => 100755 make/scripts/make.jogl.cdcfp.macosx.sh
 mode change 100644 => 100755 make/scripts/make.jogl.cdcfp.x86.sh

diff --git a/make/build.xml b/make/build.xml
index 836bb5a..1d9f38d 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -33,6 +33,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" />
 
     <property name="jogl.root"     value="${project.root}/../jogl" />
     <property name="jogl.build"    value="${jogl.root}/${rootrel.build}" />
@@ -92,7 +93,7 @@
         <property name="swt.jar"            value="${user.swt.jar}"/>
     </target>
 
-    <target name="init" depends="gluegen.cpptasks.detect.os,java.class.path.validate,setup.gles,setup.cg.excludes,skip.cg.excludes,init.swt">
+    <target name="init" depends="jogamp.env.init,gluegen.cpptasks.detect.os,java.class.path.validate,setup.gles,setup.cg.excludes,skip.cg.excludes,init.swt">
         <property name="jogl.core.jar"       value="${jogl.build}/jogl/jogl.core.jar" />
         <condition property="jogl.cg.jar"    value="${jogl.build}/jogl/jogl.cg.jar">
           <isset property="jogl.cg"/>
diff --git a/make/scripts/make.jogl.all.macosx.sh b/make/scripts/make.jogl.all.macosx.sh
old mode 100644
new mode 100755
diff --git a/make/scripts/make.jogl.all.win32.bat b/make/scripts/make.jogl.all.win32.bat
old mode 100644
new mode 100755
diff --git a/make/scripts/make.jogl.all.win64.bat b/make/scripts/make.jogl.all.win64.bat
old mode 100644
new mode 100755
diff --git a/make/scripts/make.jogl.all.x86.sh b/make/scripts/make.jogl.all.x86.sh
old mode 100644
new mode 100755
diff --git a/make/scripts/make.jogl.all.x86_64.sh b/make/scripts/make.jogl.all.x86_64.sh
old mode 100644
new mode 100755
diff --git a/make/scripts/make.jogl.cdcfp.macosx.sh b/make/scripts/make.jogl.cdcfp.macosx.sh
old mode 100644
new mode 100755
diff --git a/make/scripts/make.jogl.cdcfp.x86.sh b/make/scripts/make.jogl.cdcfp.x86.sh
old mode 100644
new mode 100755
-- 
cgit v1.2.3