summaryrefslogtreecommitdiffstats
path: root/src/java/jogamp/common/os/WindowsDynamicLinkerImpl.java
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-02-12 06:06:59 +0100
committerSven Gothel <[email protected]>2012-02-12 06:06:59 +0100
commitbd5be69aee6987754f1cbf39f61280c5c72536b3 (patch)
treeb6894cbc2bc6e659ac0d921a9c50ff664269faac /src/java/jogamp/common/os/WindowsDynamicLinkerImpl.java
parent67854df4b16ce92d0e792f3c693ced0a6470f6cc (diff)
DynamicLibraryBundle (enhancement)
- Hold DEBUG, DEBUG_LOOKUP in DynamicLookupHelper - Tool complete only if named tool's GetProcAddressFunc is avail - Allow no tool/glue lib's - Use DEBUG_LOCKUP for lockup symbol trace
Diffstat (limited to 'src/java/jogamp/common/os/WindowsDynamicLinkerImpl.java')
-rwxr-xr-xsrc/java/jogamp/common/os/WindowsDynamicLinkerImpl.java17
1 files changed, 2 insertions, 15 deletions
diff --git a/src/java/jogamp/common/os/WindowsDynamicLinkerImpl.java b/src/java/jogamp/common/os/WindowsDynamicLinkerImpl.java
index f5229f4..e7f5b52 100755
--- a/src/java/jogamp/common/os/WindowsDynamicLinkerImpl.java
+++ b/src/java/jogamp/common/os/WindowsDynamicLinkerImpl.java
@@ -2,23 +2,10 @@
package jogamp.common.os;
-import java.security.*;
-
import com.jogamp.common.os.DynamicLinker;
public class WindowsDynamicLinkerImpl implements DynamicLinker {
- private static boolean DEBUG;
-
- static {
- AccessController.doPrivileged(new PrivilegedAction() {
- public Object run() {
- DEBUG = (System.getProperty("jogamp.debug.NativeLibrary") != null);
- return null;
- }
- });
- }
-
/** Interface to C language function: <br> <code> BOOL FreeLibrary(HANDLE hLibModule); </code> */
private static native int FreeLibrary(long hLibModule);
@@ -61,14 +48,14 @@ public class WindowsDynamicLinkerImpl implements DynamicLinker {
addr = GetProcAddressA(libraryHandle, _symbolName);
}
}
- if(DEBUG) {
+ if(DEBUG_LOOKUP) {
System.err.println("WindowsDynamicLinkerImpl.lookupSymbol(0x"+Long.toHexString(libraryHandle)+", "+symbolName+") -> "+_symbolName+", 0x"+Long.toHexString(addr));
}
return addr;
}
public long lookupSymbolGlobal(String symbolName) {
- if(DEBUG) {
+ if(DEBUG_LOOKUP) {
System.err.println("lookupSymbolGlobal: Not supported on Windows");
}
// allow DynamicLibraryBundle to continue w/ local libs