Merge branch 'master' of ssh://jogamp.org/srv/scm/gluegen

3 files changed, 8 insertions, 8 deletions

diff --git a/make/scripts/make.gluegen.all.macosx.sh b/make/scripts/make.gluegen.all.macosx.sh
index 1078cec..51b9894 100644
--- a/make/scripts/make.gluegen.all.macosx.sh
+++ b/make/scripts/make.gluegen.all.macosx.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 
-if [ -e /devtools/etc/profile.ant ] ; then
-    . /devtools/etc/profile.ant
+if [ -e /opt-share/etc/profile.ant ] ; then
+    . /opt-share/etc/profile.ant
 fi
 
 #    -Dc.compiler.debug=true 
diff --git a/make/scripts/make.gluegen.all.win32.bat b/make/scripts/make.gluegen.all.win32.bat
index 5192a1a..c523de8 100644
--- a/make/scripts/make.gluegen.all.win32.bat
+++ b/make/scripts/make.gluegen.all.win32.bat
@@ -1,8 +1,8 @@
 set THISDIR="C:\JOGL"

 

-set J2RE_HOME=c:\jre1.6.0_22_x32

-set JAVA_HOME=c:\jdk1.6.0_22_x32

-set ANT_PATH=C:\apache-ant-1.8.0

+set J2RE_HOME=c:\jre1.6.0_24_x32

+set JAVA_HOME=c:\jdk1.6.0_24_x32

+set ANT_PATH=C:\apache-ant-1.8.2

 

 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%

 

diff --git a/make/scripts/make.gluegen.all.win64.bat b/make/scripts/make.gluegen.all.win64.bat
index 1c73e80..76cb6fc 100644
--- a/make/scripts/make.gluegen.all.win64.bat
+++ b/make/scripts/make.gluegen.all.win64.bat
@@ -1,8 +1,8 @@
 set THISDIR="C:\JOGL"

 

-set J2RE_HOME=c:\jre1.6.0_22_x64

-set JAVA_HOME=c:\jdk1.6.0_22_x64

-set ANT_PATH=C:\apache-ant-1.8.0

+set J2RE_HOME=c:\jre1.6.0_24_x64

+set JAVA_HOME=c:\jdk1.6.0_24_x64

+set ANT_PATH=C:\apache-ant-1.8.2

 

 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;c:\mingw\bin;%PATH%