8 files changed, 47 insertions, 35 deletions
diff --git a/make/gluegen-properties.xml b/make/gluegen-properties.xml
index 7e51e0a..8038de3 100755
--- a/make/gluegen-properties.xml
+++ b/make/gluegen-properties.xml
@@ -7,7 +7,7 @@
    - externally:
    - 
    -   gcc.compat.compiler
-   -       either "gcc" (default) or "clang"
+   -       either "gcc" (default), "clang" or "xcode.clang" (default for OSX)
    -
    -   win32.c.compiler (required to be set on Windows):
    -       one of "vc6", "vc7", "vc8", "mingw32" (default) or "mingw64".
@@ -49,6 +49,7 @@
     <property name="gluegen.user.properties.file.set" value="${gluegen.user.properties.file}"/>
     <property file="${gluegen.user.properties.file.set}" />
     <echo message="Loaded ${gluegen.user.properties.file.set}." />
+    <echo message="Setting defaults:" />
     <property name="antlr.jar" value="${gluegen.root}/make/lib/antlr.jar" />
     <property name="junit.jar" value="${gluegen.root}/make/lib/junit.jar" />
     <property name="ant.jar"       value="${ant.home}/lib/ant.jar" />
@@ -85,7 +86,14 @@
     <property name="ant-junit-all.apk" value="${gluegen.root}/make/lib/ant-junit-all.apk" />
 
     <!-- maybe overriden, e.g. with "clang" -->
-    <property name="gcc.compat.compiler" value="gcc"/>
+    <echo message="Setting default gcc.compat.compiler" />
+    <condition property="gcc.compat.compiler" value="xcode.clang"> <!-- default for OSX -->
+      <and>
+        <os family="mac"/>
+        <os family="unix"/>
+      </and>
+    </condition>
+    <property name="gcc.compat.compiler" value="gcc"/>             <!-- default for all others .. -->
     <echo message="gcc.compat.compiler=${gcc.compat.compiler}" />
 
     <condition property="win32.c.compiler" value="mingw64">
diff --git a/make/gluegen.properties b/make/gluegen.properties
index 62bb84d..b33c7e3 100755
--- a/make/gluegen.properties
+++ b/make/gluegen.properties
@@ -33,6 +33,7 @@
 # You can set the gcc compatible compiler to either gcc or clang:
 #gcc.compat.compiler=gcc
 #gcc.compat.compiler=clang
+#gcc.compat.compiler=xcode.clang
 
 #   MacOsX libraries can be universal / fat binaries.
 #   The following switches enables/disables a target platform.
diff --git a/make/lib/gluegen-xcode_clang.properties b/make/lib/gluegen-xcode_clang.properties
deleted file mode 100755
index 7526552..0000000
--- a/make/lib/gluegen-xcode_clang.properties
+++ /dev/null
@@ -1 +0,0 @@
-gcc.compat.compiler=xcode.clang
diff --git a/make/scripts/make.gluegen.all.macosx-clang.sh b/make/scripts/make.gluegen.all.macosx-clang.sh
deleted file mode 100755
index f66c153..0000000
--- a/make/scripts/make.gluegen.all.macosx-clang.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh
-
-if [ -e /opt-share/etc/profile.ant ] ; then
-    . /opt-share/etc/profile.ant
-fi
-
-#    -Dc.compiler.debug=true 
-#
-#    -Dtarget.sourcelevel=1.6 \
-#    -Dtarget.targetlevel=1.6 \
-#    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
-
-JAVA_HOME=`/usr/libexec/java_home -version 1.7`
-PATH=$JAVA_HOME/bin:$PATH
-export JAVA_HOME PATH
-
-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="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.gluegen.all.macosx.log
diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh
index c054bc1..b1089c5 100755
--- a/make/scripts/runtest.sh
+++ b/make/scripts/runtest.sh
@@ -80,7 +80,7 @@ function onetest() {
 #onetest com.jogamp.common.util.TestSystemPropsAndEnvs 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.TestVersionNumber 2>&1 | tee -a $LOG
-onetest com.jogamp.common.util.TestVersionSemantics 2>&1 | tee -a $LOG
+#onetest com.jogamp.common.util.TestVersionSemantics 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.TestIteratorIndexCORE 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.locks.TestRecursiveLock01 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.locks.TestRecursiveThreadGroupLock01 2>&1 | tee -a $LOG
@@ -119,7 +119,7 @@ onetest com.jogamp.common.util.TestVersionSemantics 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.os.TestElfReader01 2>&1 | tee -a $LOG
 #onetest com.jogamp.gluegen.PCPPTest 2>&1 | tee -a $LOG
 #onetest com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter 2>&1 | tee -a $LOG
-#onetest com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter 2>&1 | tee -a $LOG
+onetest com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter 2>&1 | tee -a $LOG
 #onetest com.jogamp.gluegen.test.junit.generation.Test1p2LoadJNIAndImplLib 2>&1 | tee -a $LOG
 #onetest com.jogamp.gluegen.test.junit.structgen.TestStructGen01 2>&1 | tee -a $LOG
 #onetest com.jogamp.gluegen.test.junit.structgen.TestStructGen02 2>&1 | tee -a $LOG
diff --git a/make/scripts/setenv-build-jogl-x86.sh b/make/scripts/setenv-build-jogl-x86.sh
index f035a4a..ce055ba 100644
--- a/make/scripts/setenv-build-jogl-x86.sh
+++ b/make/scripts/setenv-build-jogl-x86.sh
@@ -68,6 +68,18 @@ if [ -z "$FOUND_JAVA" ] ; then
     fi
 fi
 
+if [ -z "$FOUND_JAVA" ] ; then
+    # make a symbolic link, e.g. OpenJDK:
+    # /usr/lib/jvm/java-7-openjdk-i386 -> /usr/lib/jvm/java-i386
+    if [ -e /usr/lib/jvm/java-i386 ] ; then
+        J2RE_HOME=/usr/lib/jvm/java-i386/jre
+        JAVA_HOME=/usr/lib/jvm/java-i386
+        PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
+        export J2RE_HOME JAVA_HOME
+        FOUND_JAVA=1
+    fi 
+fi 
+
 export PATH
 
 echo FOUND_JAVA $FOUND_JAVA
diff --git a/make/scripts/setenv-build-jogl-x86_64.sh b/make/scripts/setenv-build-jogl-x86_64.sh
index 8994365..a18bbe0 100644
--- a/make/scripts/setenv-build-jogl-x86_64.sh
+++ b/make/scripts/setenv-build-jogl-x86_64.sh
@@ -79,6 +79,19 @@ if [ -z "$FOUND_JAVA" ] ; then
     fi
 fi
 
+if [ -z "$FOUND_JAVA" ] ; then
+    # make a symbolic link, e.g. OpenJDK:
+    # /usr/lib/jvm/java-7-openjdk-amd64 -> /usr/lib/jvm/java-amd64
+    if [ -e /usr/lib/jvm/java-amd64 ] ; then
+        J2RE_HOME=/usr/lib/jvm/java-amd64/jre
+        JAVA_HOME=/usr/lib/jvm/java-amd64
+        PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
+        export J2RE_HOME JAVA_HOME
+        FOUND_JAVA=1
+    fi 
+fi 
+
+
 export PATH
 
 echo FOUND_JAVA $FOUND_JAVA
diff --git a/make/stub_includes/platform/glibc-compat-symbols.h b/make/stub_includes/platform/glibc-compat-symbols.h
index e07641e..3599b82 100644
--- a/make/stub_includes/platform/glibc-compat-symbols.h
+++ b/make/stub_includes/platform/glibc-compat-symbols.h
@@ -16,7 +16,15 @@
  * Check build-in macro definitions via 'gcc -dM -E - < /dev/null'
  */
 #if defined(__linux__) /* Actually we like to test whether we link against GLIBC .. */
-    #if defined(__GNUC__) || defined(__clang__)
+    #if defined(__GNUC__)
+        #if defined(__arm__)
+           #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.4");
+        #elif defined(__amd64__)
+           #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.2.5");
+        #else
+           #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.0");
+        #endif /*__amd64__*/
+    #elif defined(__clang__)
         #if defined(__arm__)
            #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.4");
         #elif defined(__amd64__)