aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/java/com/jogamp/common/nio/AbstractBuffer.java2
-rw-r--r--src/java/com/jogamp/common/nio/PointerBuffer.java2
-rw-r--r--src/java/com/jogamp/common/os/NativeLibrary.java2
-rw-r--r--src/java/com/jogamp/common/os/Platform.java4
-rw-r--r--src/java/jogamp/common/os/MachineDataInfoRuntime.java2
-rw-r--r--src/java/jogamp/common/os/PlatformPropsImpl.java4
-rw-r--r--src/junit/com/jogamp/common/util/TestTempJarCache.java2
7 files changed, 9 insertions, 9 deletions
diff --git a/src/java/com/jogamp/common/nio/AbstractBuffer.java b/src/java/com/jogamp/common/nio/AbstractBuffer.java
index 2da6440..a774c39 100644
--- a/src/java/com/jogamp/common/nio/AbstractBuffer.java
+++ b/src/java/com/jogamp/common/nio/AbstractBuffer.java
@@ -48,7 +48,7 @@ public abstract class AbstractBuffer<B extends AbstractBuffer> implements Native
protected int position;
static {
- Platform.initSingleton(); // loads native gluegen-rt library
+ Platform.initSingleton(); // loads native gluegen_rt library
}
/**
diff --git a/src/java/com/jogamp/common/nio/PointerBuffer.java b/src/java/com/jogamp/common/nio/PointerBuffer.java
index e9138ac..7498756 100644
--- a/src/java/com/jogamp/common/nio/PointerBuffer.java
+++ b/src/java/com/jogamp/common/nio/PointerBuffer.java
@@ -53,7 +53,7 @@ public class PointerBuffer extends AbstractBuffer<PointerBuffer> {
protected LongObjectHashMap dataMap = null;
static {
- Platform.initSingleton(); // loads native gluegen-rt library
+ Platform.initSingleton(); // loads native gluegen_rt library
}
/** no backup array, use for direct usage only */
diff --git a/src/java/com/jogamp/common/os/NativeLibrary.java b/src/java/com/jogamp/common/os/NativeLibrary.java
index bbe97af..2a42bed 100644
--- a/src/java/com/jogamp/common/os/NativeLibrary.java
+++ b/src/java/com/jogamp/common/os/NativeLibrary.java
@@ -209,7 +209,7 @@ public final class NativeLibrary implements DynamicLookupHelper {
macOSXLibName,
searchSystemPath, searchSystemPathFirst,
loader);
- Platform.initSingleton(); // loads native gluegen-rt library
+ Platform.initSingleton(); // loads native gluegen_rt library
final DynamicLinker dynLink = getDynamicLinker();
diff --git a/src/java/com/jogamp/common/os/Platform.java b/src/java/com/jogamp/common/os/Platform.java
index 1bd3b9d..ca3d60b 100644
--- a/src/java/com/jogamp/common/os/Platform.java
+++ b/src/java/com/jogamp/common/os/Platform.java
@@ -321,7 +321,7 @@ public class Platform extends PlatformPropsImpl {
DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false, cl);
// JVM bug workaround
- JVMUtil.initSingleton(); // requires gluegen-rt, one-time init.
+ JVMUtil.initSingleton(); // requires gluegen_rt, one-time init.
// AWT Headless determination
if( !PropertyAccess.getBooleanProperty("java.awt.headless", true) &&
@@ -354,7 +354,7 @@ public class Platform extends PlatformPropsImpl {
}
/**
- * kick off static initialization of <i>platform property information</i> and <i>native gluegen-rt lib loading</i>
+ * kick off static initialization of <i>platform property information</i> and <i>native gluegen_rt lib loading</i>
*/
public static void initSingleton() { }
diff --git a/src/java/jogamp/common/os/MachineDataInfoRuntime.java b/src/java/jogamp/common/os/MachineDataInfoRuntime.java
index 625e537..0b920f5 100644
--- a/src/java/jogamp/common/os/MachineDataInfoRuntime.java
+++ b/src/java/jogamp/common/os/MachineDataInfoRuntime.java
@@ -128,7 +128,7 @@ public class MachineDataInfoRuntime {
private static MachineDataInfo getRuntimeImpl() {
try {
- Platform.initSingleton(); // loads native gluegen-rt library
+ Platform.initSingleton(); // loads native gluegen_rt library
} catch (final UnsatisfiedLinkError err) {
return null;
}
diff --git a/src/java/jogamp/common/os/PlatformPropsImpl.java b/src/java/jogamp/common/os/PlatformPropsImpl.java
index 2900c99..1d38f30 100644
--- a/src/java/jogamp/common/os/PlatformPropsImpl.java
+++ b/src/java/jogamp/common/os/PlatformPropsImpl.java
@@ -405,7 +405,7 @@ public abstract class PlatformPropsImpl {
* For Elf parsing one of the following binaries is used:
* <ul>
* <li>Linux: Current executable</li>
- * <li>Android: Found gluegen-rt library</li>
+ * <li>Android: Found gluegen_rt library</li>
* <li>Other: A found java/jvm native library.</li>
* </ul>
* </p>
@@ -417,7 +417,7 @@ public abstract class PlatformPropsImpl {
File file = null;
try {
if( OSType.ANDROID == osType ) {
- file = new File(NativeLibrary.findLibrary("gluegen-rt", PlatformPropsImpl.class.getClassLoader()));
+ file = new File(NativeLibrary.findLibrary("gluegen_rt", PlatformPropsImpl.class.getClassLoader()));
} else {
if( OSType.LINUX == osType ) {
file = new File("/proc/self/exe");
diff --git a/src/junit/com/jogamp/common/util/TestTempJarCache.java b/src/junit/com/jogamp/common/util/TestTempJarCache.java
index 4ba09af..e059326 100644
--- a/src/junit/com/jogamp/common/util/TestTempJarCache.java
+++ b/src/junit/com/jogamp/common/util/TestTempJarCache.java
@@ -197,7 +197,7 @@ public class TestTempJarCache extends SingletonJunitCase {
public void testTempJarCache02AddNativeLibs() throws IOException, IllegalArgumentException, URISyntaxException {
if(AndroidVersion.isAvailable) { System.err.println("n/a on Android"); return; }
final Uri.Encoded nativeJarName = Uri.Encoded.cast("gluegen-rt-natives-"+Platform.getOSAndArch()+".jar");
- final String libBaseName = "gluegen-rt";
+ final String libBaseName = "gluegen_rt";
final ClassLoader cl = getClass().getClassLoader();
final Uri jarUri = JarUtil.getJarUri(TempJarCache.class.getName(), cl);