3 files changed, 11 insertions, 13 deletions
diff --git a/make/config/cl-impl.cfg b/make/config/cl-impl.cfg
index 62ce703b..d9423024 100644
--- a/make/config/cl-impl.cfg
+++ b/make/config/cl-impl.cfg
@@ -56,11 +56,11 @@ Ignore clGetExtensionFunctionAddress
 ForceProcAddressGen clGetExtensionFunctionAddress
 
 #append to generated c files
+CustomCCode #include <inttypes.h>
+CustomCCode #include <GL/glcorearb.h>
 CustomCCode #include <CL/cl.h>
 CustomCCode #include <CL/cl_ext.h>
 CustomCCode #include <CL/cl_gl.h>
-CustomCCode #include <GL/glcorearb.h>
-CustomCCode #include <inttypes.h>
 
 # implement manually via custom code
 Ignore              clCreateContext
diff --git a/make/scripts/make.jocl.all.macosx-clang.sh b/make/scripts/make.jocl.all.macosx-java6.sh
index 6e5552d9..2d678ac3 100755
--- a/make/scripts/make.jocl.all.macosx-clang.sh
+++ b/make/scripts/make.jocl.all.macosx-java6.sh
@@ -1,10 +1,13 @@
 #! /bin/sh
 
+SDIR=`dirname $0` 
+
 if [ -e /opt-share/etc/profile.ant ] ; then
     . /opt-share/etc/profile.ant
 fi
 
-JAVA_HOME=`/usr/libexec/java_home -version 1.7`
+#JAVA_HOME=`/usr/libexec/java_home -version 1.8`
+JAVA_HOME=`/usr/libexec/java_home -version 1.6`
 PATH=$JAVA_HOME/bin:$PATH
 export JAVA_HOME PATH
 
@@ -14,12 +17,9 @@ export SOURCE_LEVEL=1.6
 export TARGET_LEVEL=1.6
 export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
 
-export GLUEGEN_PROPERTIES_FILE="../../gluegen/make/lib/gluegen-xcode_clang.properties"
-# or -Dgcc.compat.compiler=xcode.clang
-
 #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
 
-ant \
-    -Drootrel.build=build-macosx \
-    $* 2>&1 | tee make.joal.all.macosx.log
+ant  \
+    -Drootrel.build=build-macosx-java6 \
+    $* 2>&1 | tee make.jocl.all.macosx-java6.log
diff --git a/make/scripts/make.jocl.all.macosx.sh b/make/scripts/make.jocl.all.macosx.sh
index 20f65b92..88e6bfe2 100755
--- a/make/scripts/make.jocl.all.macosx.sh
+++ b/make/scripts/make.jocl.all.macosx.sh
@@ -6,7 +6,8 @@ if [ -e /opt-share/etc/profile.ant ] ; then
     . /opt-share/etc/profile.ant
 fi
 
-JAVA_HOME=`/usr/libexec/java_home -version 1.7`
+JAVA_HOME=`/usr/libexec/java_home -version 1.8`
+#JAVA_HOME=`/usr/libexec/java_home -version 1.6`
 PATH=$JAVA_HOME/bin:$PATH
 export JAVA_HOME PATH
 
@@ -16,9 +17,6 @@ export SOURCE_LEVEL=1.6
 export TARGET_LEVEL=1.6
 export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
 
-export GLUEGEN_PROPERTIES_FILE="../../gluegen/make/lib/gluegen-clang.properties"
-# or -Dgcc.compat.compiler=clang
-
 #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"