diff options
Diffstat (limited to 'src')
5 files changed, 20 insertions, 5 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java b/src/jogl/classes/com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java index 52b207b0c..7f082c3df 100644 --- a/src/jogl/classes/com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java +++ b/src/jogl/classes/com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java @@ -121,6 +121,8 @@ public final class CgDynamicLibraryBundleInfo implements DynamicLibraryBundleInf return libsList; } + @Override + public List<String> getSymbolForToolLibPath() { return Arrays.asList("cgCreateContext", "cgGLLoadProgram"); } @Override public final List<String> getGlueLibNames() { diff --git a/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLookupHelper.java b/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLookupHelper.java index 5eb429774..a6e7f0ff5 100644 --- a/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLookupHelper.java +++ b/src/jogl/classes/jogamp/opengl/DesktopGLDynamicLookupHelper.java @@ -48,10 +48,8 @@ public class DesktopGLDynamicLookupHelper extends GLDynamicLookupHelper { gluLibNames.add("libGLU.so"); // unix gluLibNames.add("GLU32"); // windows gluLibNames.add("GLU"); // generic - gluLib = loadFirstAvailable(gluLibNames, true, true, null, true); - if(null != gluLib) { - nativeLibraries.add(gluLib); - } + gluLib = loadFirstAvailable(gluLibNames, true, true, null, true, "gluScaleImage"); + toolLibraries.add(gluLib); } return null != gluLib ; } diff --git a/src/jogl/classes/jogamp/opengl/GLDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/GLDynamicLibraryBundleInfo.java index 7c75b0615..a0f455802 100644 --- a/src/jogl/classes/jogamp/opengl/GLDynamicLibraryBundleInfo.java +++ b/src/jogl/classes/jogamp/opengl/GLDynamicLibraryBundleInfo.java @@ -28,6 +28,9 @@ package jogamp.opengl; +import java.util.Arrays; +import java.util.List; + import com.jogamp.common.os.DynamicLibraryBundle; import com.jogamp.common.os.DynamicLibraryBundleInfo; import com.jogamp.common.util.RunnableExecutor; @@ -36,6 +39,9 @@ public abstract class GLDynamicLibraryBundleInfo implements DynamicLibraryBundle protected GLDynamicLibraryBundleInfo() { } + @Override + public List<String> getSymbolForToolLibPath() { return Arrays.asList("glClear"); } + /** * Returns <code>true</code>, * since we might load a desktop GL library and allow symbol access to subsequent libs. diff --git a/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGDynamicLibraryBundleInfo.java index d0b6ab7e0..95b5d3b9f 100644 --- a/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGDynamicLibraryBundleInfo.java +++ b/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGDynamicLibraryBundleInfo.java @@ -359,7 +359,7 @@ class FFMPEGDynamicLibraryBundleInfo implements DynamicLibraryBundleInfo { public final List<List<String>> getToolLibNames() { final List<List<String>> libsList = new ArrayList<List<String>>(); - // 6: util, format, codec, device, avresample, swresample + // 5: util, format, codec, device, swresample final List<String> avutil = new ArrayList<String>(); if( FFMPEGMediaPlayer.PREFER_SYSTEM_LIBS ) { @@ -461,6 +461,11 @@ class FFMPEGDynamicLibraryBundleInfo implements DynamicLibraryBundleInfo { return libsList; } + @Override + public List<String> getSymbolForToolLibPath() { + // 5: util, format, codec, device, swresample + return Arrays.asList("av_free", "av_read_frame", "avcodec_close", "avdevice_register_all", "swr_convert"); + } @Override public final List<String> getToolGetProcAddressFuncNameList() { diff --git a/src/oculusvr/classes/com/jogamp/oculusvr/OVRDynamicLibraryBundleInfo.java b/src/oculusvr/classes/com/jogamp/oculusvr/OVRDynamicLibraryBundleInfo.java index 6e25c83bb..3fa242f6e 100644 --- a/src/oculusvr/classes/com/jogamp/oculusvr/OVRDynamicLibraryBundleInfo.java +++ b/src/oculusvr/classes/com/jogamp/oculusvr/OVRDynamicLibraryBundleInfo.java @@ -43,6 +43,7 @@ import java.util.*; private static final List<String> glueLibNames; static { SecurityUtil.doPrivileged(new PrivilegedAction<Object>() { + @Override public Object run() { Platform.initSingleton(); @@ -100,6 +101,9 @@ import java.util.*; } @Override + public List<String> getSymbolForToolLibPath() { return null; } + + @Override public final List<String> getToolGetProcAddressFuncNameList() { return null; } |