diff options
4 files changed, 2 insertions, 14 deletions
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index af8c1c204..83964341b 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -198,7 +198,7 @@ function testawtswt() { #testnoawt com.jogamp.opengl.test.junit.jogl.demos.gl2.newt.TestGearsNEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es1.newt.TestGearsES1NEWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* -#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* +testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es1.newt.TestRedSquareES1NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestRedSquareES2NEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.TestWindows01NEWT $* @@ -224,7 +224,7 @@ function testawtswt() { #testawt jogamp.newt.awt.opengl.VersionApplet $* #testawt javax.media.opengl.awt.GLCanvas $* #testawt com.jogamp.opengl.test.junit.jogl.acore.TestMainVersionGLCanvasAWT $* -testawt com.jogamp.opengl.test.junit.jogl.awt.TestBug551AWT $* +#testawt com.jogamp.opengl.test.junit.jogl.awt.TestBug551AWT $* #testawt com.jogamp.opengl.test.junit.jogl.awt.TestAWT01GLn $* #testawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextListAWT $* #testawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextNewtAWTBug523 $* diff --git a/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLibraryBundleInfo.java index c0a75da23..b009cf714 100644 --- a/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLibraryBundleInfo.java +++ b/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLibraryBundleInfo.java @@ -36,7 +36,6 @@ public abstract class DesktopGLDynamicLibraryBundleInfo extends GLDynamicLibrary static { glueLibNames = new ArrayList<String>(); - glueLibNames.addAll(getGlueLibNamesPreload()); glueLibNames.add("jogl_desktop"); } diff --git a/src/jogl/classes/jogamp/opengl/GLDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/GLDynamicLibraryBundleInfo.java index 433484162..f03083ac6 100644 --- a/src/jogl/classes/jogamp/opengl/GLDynamicLibraryBundleInfo.java +++ b/src/jogl/classes/jogamp/opengl/GLDynamicLibraryBundleInfo.java @@ -29,15 +29,8 @@ package jogamp.opengl; import com.jogamp.common.os.DynamicLibraryBundleInfo; -import java.util.*; public abstract class GLDynamicLibraryBundleInfo implements DynamicLibraryBundleInfo { - static List<String> glueLibNamesPreload; - static { - glueLibNamesPreload = new ArrayList<String>(); - glueLibNamesPreload.add("nativewindow_x11"); - } - protected GLDynamicLibraryBundleInfo() { } @@ -47,8 +40,5 @@ public abstract class GLDynamicLibraryBundleInfo implements DynamicLibraryBundle /** default **/ public boolean shallLookupGlobal() { return false; } - public static List<String> getGlueLibNamesPreload() { - return glueLibNamesPreload; - } } diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java index 1f9254b49..50c4950a0 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java @@ -44,7 +44,6 @@ public abstract class EGLDynamicLibraryBundleInfo extends GLDynamicLibraryBundle static List<String> glueLibNames; static { glueLibNames = new ArrayList<String>(); - glueLibNames.addAll(GLDynamicLibraryBundleInfo.getGlueLibNamesPreload()); glueLibNames.add("jogl_mobile"); } |