ES Library lookup order - Favor spec lib name

2 files changed, 17 insertions, 11 deletions

diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java
index e96e79ee2..3b0fc5957 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java
@@ -44,20 +44,22 @@ public class EGLES1DynamicLibraryBundleInfo extends EGLDynamicLibraryBundleInfo
         {
             final List<String> libsGL = new ArrayList<String>();
             
-            // try default generic names first 
+            // GLESv2
+            libsGL.add("GLESv1_CM");
+            libsGL.add("libGLESv1_CM.so");
+            // this is the default lib name, according to the spec 
+            libsGL.add("libGLESv1_CM.so.2");
+
+            // alternative names
             libsGL.add("GLES_CM");
             libsGL.add("GLES_CL");
-            libsGL.add("GLESv1_CM");
             
             // for windows distributions using the 'unlike' lib prefix, 
             // where our tool does not add it.
+            libsGL.add("libGLESv1_CM");
             libsGL.add("libGLES_CM");
             libsGL.add("libGLES_CL");
-            libsGL.add("libGLESv1_CM");
             
-            // this is the default lib name, according to the spec 
-            libsGL.add("libGLESv1_CM.so.1");
-    
             libsList.add(libsGL);
         }
         libsList.add(getEGLLibNamesList());
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java
index ac6d76220..28c480b0c 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java
@@ -44,17 +44,21 @@ public class EGLES2DynamicLibraryBundleInfo extends EGLDynamicLibraryBundleInfo
         {
             final List<String> libsGL = new ArrayList<String>();
             
-            // try default generic names first 
-            libsGL.add("GLES20");
+            // GLESv2
             libsGL.add("GLESv2");
+            libsGL.add("libGLESv2.so");
+            // this is the default lib name, according to the spec 
+            libsGL.add("libGLESv2.so.2");
+
+            // alternative names
+            libsGL.add("GLES20");
             libsGL.add("GLESv2_CM");
+
             // for windows distributions using the 'unlike' lib prefix
             // where our tool does not add it.
-            libsGL.add("libGLES20"); 
             libsGL.add("libGLESv2");
             libsGL.add("libGLESv2_CM");
-            // this is the default lib name, according to the spec 
-            libsGL.add("libGLESv2.so.2");
+            libsGL.add("libGLES20"); 
     
             libsList.add(libsGL);
         }