Merge branch 'master' of github.com:sgothel/jogl

4 files changed, 6 insertions, 6 deletions

diff --git a/make/build-gluegen.xml b/make/build-gluegen.xml
index fedfd9d93..cac29362c 100644
--- a/make/build-gluegen.xml
+++ b/make/build-gluegen.xml
@@ -89,7 +89,7 @@
            -        a separate task.  -->
         <javac destdir="${classes}" includes="**/gluegen/**" excludes="**/GlueGenTask.java"
                includeAntRuntime="false"
-               source="1.4" debug="true" debuglevel="source,lines">
+               source="1.4" debug="true" debuglevel="${javacdebuglevel}">
             <src path="${src.java}" />
             <src path="${src.generated.java}" />
             <classpath refid="antlr.classpath" />
diff --git a/make/build-staticglgen.xml b/make/build-staticglgen.xml
index 3d5fb2d12..968e3501b 100644
--- a/make/build-staticglgen.xml
+++ b/make/build-staticglgen.xml
@@ -29,7 +29,7 @@
         <mkdir dir="${classes}" />
 
         <!-- Compile BuildStaticGLInfo -->
-        <javac srcdir="${src.java}" destdir="${classes}" includes="**/BuildStaticGLInfo.java" source="1.4" debug="true" debuglevel="source,lines"
+        <javac srcdir="${src.java}" destdir="${classes}" includes="**/BuildStaticGLInfo.java" source="1.4" debug="true" debuglevel="${javacdebuglevel}"
                includeAntRuntime="false">
             <classpath refid="antlr.classpath" />
         </javac>
@@ -50,7 +50,7 @@
         <!-- Build the BuildStaticGLInfo ANT task.
            - NOTE:  ONLY the StaticGLGen is built at this time.  BuildStaticGLInfo 
            -        itself is built in a separate task.  -->
-        <javac destdir="${classes}" includes="**/StaticGLGenTask.java" source="1.4" debug="true" debuglevel="source,lines"
+        <javac destdir="${classes}" includes="**/StaticGLGenTask.java" source="1.4" debug="true" debuglevel="${javacdebuglevel}"
                includeAntRuntime="false">
 	        <src path="${src.java}" />
             <classpath refid="classpath" />
diff --git a/make/config/jogl/glu-CustomJavaCode-base.java b/make/config/jogl/glu-CustomJavaCode-base.java
index 7aee33ae1..8d2ebe662 100755
--- a/make/config/jogl/glu-CustomJavaCode-base.java
+++ b/make/config/jogl/glu-CustomJavaCode-base.java
@@ -169,7 +169,7 @@ protected static boolean checkedGLUtessellatorImpl = false;
 
 protected static final void validateGLUtessellatorImpl() {
     if(!checkedGLUtessellatorImpl) {
-        availableGLUtessellatorImpl = ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.glu.tessellator.GLUtessellatorImpl");
+        availableGLUtessellatorImpl = ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.glu.tessellator.GLUtessellatorImpl", GLU.class.getClassLoader());
         checkedGLUtessellatorImpl = true;
     }
     if(!availableGLUtessellatorImpl) {
@@ -1220,7 +1220,7 @@ protected static final void validateGLUquadricImpl() {
     if(!checkedGLUquadricImpl) {
         synchronized (syncObject) {
             if(!checkedGLUquadricImpl) {
-                availableGLUquadricImpl = ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.glu.GLUquadricImpl");
+                availableGLUquadricImpl = ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.glu.GLUquadricImpl", GLU.class.getClassLoader());
                 checkedGLUquadricImpl = true;
             }
         }
diff --git a/make/config/jogl/glu-CustomJavaCode-gl2es1.java b/make/config/jogl/glu-CustomJavaCode-gl2es1.java
index 742f7c240..3f520498b 100755
--- a/make/config/jogl/glu-CustomJavaCode-gl2es1.java
+++ b/make/config/jogl/glu-CustomJavaCode-gl2es1.java
@@ -86,7 +86,7 @@ protected static boolean checkedMipmap = false;
 
 protected static final void validateMipmap() {
     if(!checkedMipmap) {
-        availableMipmap = ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.glu.mipmap.Mipmap");
+        availableMipmap = ReflectionUtil.isClassAvailable("com.jogamp.opengl.impl.glu.mipmap.Mipmap", GLU.class.getClassLoader());
         checkedMipmap = true;
     }
     if(!availableMipmap) {