From 56434e48876a85e027bca5463afdc86929d025cf Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Mon, 26 Mar 2012 21:05:15 +0200 Subject: Adapt to gluegen commit 1c03dfd6d1939a46018583419956e350e531f4fe - Fix Bug 566 --- .../com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/jogl/classes/com/jogamp/opengl/cg') diff --git a/src/jogl/classes/com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java b/src/jogl/classes/com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java index ba159b82c..d901096bc 100644 --- a/src/jogl/classes/com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java +++ b/src/jogl/classes/com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java @@ -29,8 +29,10 @@ package com.jogamp.opengl.cg; import com.jogamp.common.jvm.JNILibLoaderBase; +import com.jogamp.common.os.DynamicLibraryBundle; import com.jogamp.common.os.DynamicLibraryBundleInfo; import com.jogamp.common.os.Platform; +import com.jogamp.common.util.RunnableExecutor; import com.jogamp.common.util.cache.TempJarCache; import java.security.AccessController; @@ -66,25 +68,31 @@ public class CgDynamicLibraryBundleInfo implements DynamicLibraryBundleInfo { } /** Make Cg symbols available to CgGL */ + @Override public boolean shallLinkGlobal() { return true; } /** default **/ + @Override public boolean shallLookupGlobal() { return false; } /** Tool has none **/ + @Override public final List getToolGetProcAddressFuncNameList() { return null; } /** Tool has none **/ + @Override public final long toolGetProcAddress(long toolGetProcAddressHandle, String funcName) { return 0; } + @Override public boolean useToolGetProcAdressFirst(String funcName) { return false; } + @Override public List> getToolLibNames() { final List> libsList = new ArrayList>(); final List libsCg = new ArrayList(); @@ -98,9 +106,15 @@ public class CgDynamicLibraryBundleInfo implements DynamicLibraryBundleInfo { return libsList; } + @Override public final List getGlueLibNames() { return glueLibNames; } + + @Override + public RunnableExecutor getLibLoaderExecutor() { + return DynamicLibraryBundle.getDefaultRunnableExecutor(); + } } -- cgit v1.2.3