summaryrefslogtreecommitdiffstats
path: root/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2011-08-31 03:25:48 +0200
committerSven Gothel <[email protected]>2011-08-31 03:25:48 +0200
commitc75785dcc4758b3d865c5ccf6677389ab112d2fb (patch)
treed3c035106df01c6116c6c70f1479f8c352d74a07 /src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java
parent490a6ebf64d767f5395554da78dda96ebb59b0fc (diff)
DynamicLibraryBundle*: Use generics for better spec - following gluegen commit cfb9e118e020707842e6b5136b07f5ab149540c1
Diffstat (limited to 'src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java')
-rw-r--r--src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java44
1 files changed, 24 insertions, 20 deletions
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java
index 4c38a29b1..e96e79ee2 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java
@@ -39,26 +39,30 @@ public class EGLES1DynamicLibraryBundleInfo extends EGLDynamicLibraryBundleInfo
super();
}
- public List getToolLibNames() {
- List/*<List>*/ libNames = new ArrayList();
-
- List/*<String>*/ glesLibNames = new ArrayList();
+ public List<List<String>> getToolLibNames() {
+ final List<List<String>> libsList = new ArrayList<List<String>>();
+ {
+ final List<String> libsGL = new ArrayList<String>();
+
+ // try default generic names first
+ 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("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());
- // try default generic names first
- glesLibNames.add("GLES_CM");
- glesLibNames.add("GLES_CL");
- glesLibNames.add("GLESv1_CM");
- // for windows distributions using the 'unlike' lib prefix,
- // where our tool does not add it.
- glesLibNames.add("libGLES_CM");
- glesLibNames.add("libGLES_CL");
- glesLibNames.add("libGLESv1_CM");
- // this is the default lib name, according to the spec
- glesLibNames.add("libGLESv1_CM.so.1");
-
- libNames.add(glesLibNames);
- libNames.add(getEGLLibNamesList());
- return libNames;
- }
+ return libsList;
+ }
}