From 5951b33b303df3a12888fe0fbc5ccc88112a3984 Mon Sep 17 00:00:00 2001 From: Mark Raynsford Date: Mon, 30 Jun 2014 12:45:53 +0000 Subject: Attempt to remove aliasing from native libraries. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Renamed: jogl-core.jar → jogl.jar nativewindow-core.jar → nativewindow.jar The build scripts have been edited to produce sets of natives for each "module" (as opposed to producing one set of natives and then have each module point to them via aliasing). Bug: 1023 Bug: 1024 Depends on 46faa59d439ef235d7691fc64d56eedc600ffa1a from gluegen. --- src/jogl/classes/com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java | 2 +- .../classes/com/jogamp/oculusvr/OVRDynamicLibraryBundleInfo.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/jogl/classes/com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java b/src/jogl/classes/com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java index 4270607f2..52c2e78eb 100644 --- a/src/jogl/classes/com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java +++ b/src/jogl/classes/com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java @@ -49,7 +49,7 @@ public final class CgDynamicLibraryBundleInfo implements DynamicLibraryBundleInf if(TempJarCache.isInitialized()) { // only: jogl-cg.jar -> jogl-cg-natives-.jar [atomic JAR files only] - JNILibLoaderBase.addNativeJarLibs(new Class[] { CgDynamicLibraryBundleInfo.class }, null, null ); + JNILibLoaderBase.addNativeJarLibs(new Class[] { CgDynamicLibraryBundleInfo.class }, null); } return null; } diff --git a/src/oculusvr/classes/com/jogamp/oculusvr/OVRDynamicLibraryBundleInfo.java b/src/oculusvr/classes/com/jogamp/oculusvr/OVRDynamicLibraryBundleInfo.java index 6bd9d1a64..3f4e94195 100644 --- a/src/oculusvr/classes/com/jogamp/oculusvr/OVRDynamicLibraryBundleInfo.java +++ b/src/oculusvr/classes/com/jogamp/oculusvr/OVRDynamicLibraryBundleInfo.java @@ -48,7 +48,7 @@ import java.util.*; if(TempJarCache.isInitialized()) { // only: joal.jar -> joal-natives-.jar - JNILibLoaderBase.addNativeJarLibs(new Class[] { OVRDynamicLibraryBundleInfo.class }, null, null ); + JNILibLoaderBase.addNativeJarLibs(new Class[] { OVRDynamicLibraryBundleInfo.class }, null); } return null; } -- cgit v1.2.3