summaryrefslogtreecommitdiffstats
path: root/src/nativewindow/classes/com/jogamp
diff options
context:
space:
mode:
authorSven Gothel <sgothel@jausoft.com>2013-03-28 23:24:39 +0100
committerSven Gothel <sgothel@jausoft.com>2013-03-28 23:24:39 +0100
commit0b242442fba01df86be636f54e3d478aa722d6a7 (patch)
treed3199b96411e926a41aab60629d5afece6c30ef4 /src/nativewindow/classes/com/jogamp
parenta121055f9e4ac039fa820f06e9e81e5ce72e5e24 (diff)
Adapt to new version scheme, see GlueGen a3f2ef50ad33c58a240a17fcf03e415d772207c3, etc; Fix NewtVersion, NativeWindowVersion and NewtVersionActivityLauncher
NewtVersion, NativeWindowVersion: Also search for extension javax.media.opengl (all packaging) NewtVersionActivityLauncher: Use new launcher URI
Diffstat (limited to 'src/nativewindow/classes/com/jogamp')
-rw-r--r--src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowVersion.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowVersion.java b/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowVersion.java
index 38bd70a90..29f4964c0 100644
--- a/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowVersion.java
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowVersion.java
@@ -31,6 +31,7 @@ package com.jogamp.nativewindow;
import com.jogamp.common.GlueGenVersion;
import com.jogamp.common.util.JogampVersion;
import com.jogamp.common.util.VersionUtil;
+
import java.util.jar.Manifest;
public class NativeWindowVersion extends JogampVersion {
@@ -45,9 +46,10 @@ public class NativeWindowVersion extends JogampVersion {
if(null == jogampCommonVersionInfo) { // volatile: ok
synchronized(NativeWindowVersion.class) {
if( null == jogampCommonVersionInfo ) {
- final String packageName = "javax.media.nativewindow";
- final Manifest mf = VersionUtil.getManifest(NativeWindowVersion.class.getClassLoader(), packageName);
- jogampCommonVersionInfo = new NativeWindowVersion(packageName, mf);
+ final String packageName1 = "javax.media.nativewindow"; // atomic packaging - and identity
+ final String packageName2 = "javax.media.opengl"; // all packaging
+ final Manifest mf = VersionUtil.getManifest(NativeWindowVersion.class.getClassLoader(), new String[]{ packageName1, packageName2 } );
+ jogampCommonVersionInfo = new NativeWindowVersion(packageName1, mf);
}
}
}