From 5951b33b303df3a12888fe0fbc5ccc88112a3984 Mon Sep 17 00:00:00 2001
From: Mark Raynsford <code@io7m.com>
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.
---
 jnlp-files/atomic/jogl-awt.jnlp           | 2 +-
 jnlp-files/atomic/jogl-noawt.jnlp         | 2 +-
 jnlp-files/atomic/nativewindow-awt.jnlp   | 2 +-
 jnlp-files/atomic/nativewindow-noawt.jnlp | 2 +-
 jnlp-files/atomic/newt-awt-jogl.jnlp      | 2 +-
 jnlp-files/atomic/newt-awt.jnlp           | 2 +-
 jnlp-files/atomic/newt-noawt-jogl.jnlp    | 2 +-
 jnlp-files/atomic/newt-noawt.jnlp         | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'jnlp-files/atomic')

diff --git a/jnlp-files/atomic/jogl-awt.jnlp b/jnlp-files/atomic/jogl-awt.jnlp
index 8f15a6c58..528632e96 100644
--- a/jnlp-files/atomic/jogl-awt.jnlp
+++ b/jnlp-files/atomic/jogl-awt.jnlp
@@ -14,7 +14,7 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="jar/atomic/jogl-core.jar" />
+      <jar href="jar/atomic/jogl.jar" />
       <jar href="jar/atomic/jogl-sdk.jar" />
       <jar href="jar/atomic/jogl-util.jar" />
       <jar href="jar/atomic/jogl-awt.jar" />
diff --git a/jnlp-files/atomic/jogl-noawt.jnlp b/jnlp-files/atomic/jogl-noawt.jnlp
index 91a1fe89b..15f1ac8e8 100644
--- a/jnlp-files/atomic/jogl-noawt.jnlp
+++ b/jnlp-files/atomic/jogl-noawt.jnlp
@@ -14,7 +14,7 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="jar/atomic/jogl-core.jar" />
+      <jar href="jar/atomic/jogl.jar" />
       <jar href="jar/atomic/jogl-sdk.jar" />
       <jar href="jar/atomic/jogl-util.jar" />
       <jar href="jar/atomic/jogl-glutess.jar" />
diff --git a/jnlp-files/atomic/nativewindow-awt.jnlp b/jnlp-files/atomic/nativewindow-awt.jnlp
index a993ab14a..7bcac3c7a 100644
--- a/jnlp-files/atomic/nativewindow-awt.jnlp
+++ b/jnlp-files/atomic/nativewindow-awt.jnlp
@@ -14,7 +14,7 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="jar/atomic/nativewindow-core.jar" />
+      <jar href="jar/atomic/nativewindow.jar" />
       <jar href="jar/atomic/nativewindow-awt.jar"/>
       <extension name="gluegen-rt"   href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" />
     </resources>
diff --git a/jnlp-files/atomic/nativewindow-noawt.jnlp b/jnlp-files/atomic/nativewindow-noawt.jnlp
index 5cd4872dc..30d5baca2 100644
--- a/jnlp-files/atomic/nativewindow-noawt.jnlp
+++ b/jnlp-files/atomic/nativewindow-noawt.jnlp
@@ -14,7 +14,7 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="jar/atomic/nativewindow-core.jar" />
+      <jar href="jar/atomic/nativewindow.jar" />
       <extension name="gluegen-rt"   href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" />
     </resources>
 
diff --git a/jnlp-files/atomic/newt-awt-jogl.jnlp b/jnlp-files/atomic/newt-awt-jogl.jnlp
index 0a43128bb..27be5b4cc 100644
--- a/jnlp-files/atomic/newt-awt-jogl.jnlp
+++ b/jnlp-files/atomic/newt-awt-jogl.jnlp
@@ -14,7 +14,7 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="jar/atomic/newt-core.jar" />
+      <jar href="jar/atomic/newt.jar" />
       <jar href="jar/atomic/newt-ogl.jar" />
       <jar href="jar/atomic/newt-awt.jar" />
       <extension name="jogl-awt" href="JOGL_CODEBASE_TAG/jogl-awt.jnlp" />
diff --git a/jnlp-files/atomic/newt-awt.jnlp b/jnlp-files/atomic/newt-awt.jnlp
index 6e46b82a4..2edaf210c 100644
--- a/jnlp-files/atomic/newt-awt.jnlp
+++ b/jnlp-files/atomic/newt-awt.jnlp
@@ -14,7 +14,7 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="jar/atomic/newt-core.jar" />
+      <jar href="jar/atomic/newt.jar" />
       <jar href="jar/atomic/newt-awt.jar" />
       <extension name="nativewindow-awt" href="JOGL_CODEBASE_TAG/nativewindow-awt.jnlp" />
     </resources>
diff --git a/jnlp-files/atomic/newt-noawt-jogl.jnlp b/jnlp-files/atomic/newt-noawt-jogl.jnlp
index 5b671edcd..302d3699c 100644
--- a/jnlp-files/atomic/newt-noawt-jogl.jnlp
+++ b/jnlp-files/atomic/newt-noawt-jogl.jnlp
@@ -14,7 +14,7 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="jar/atomic/newt-core.jar" />
+      <jar href="jar/atomic/newt.jar" />
       <jar href="jar/atomic/newt-ogl.jar" />
       <extension name="jogl-noawt" href="JOGL_CODEBASE_TAG/jogl-noawt.jnlp" />
     </resources>
diff --git a/jnlp-files/atomic/newt-noawt.jnlp b/jnlp-files/atomic/newt-noawt.jnlp
index 1161d7a9c..a69e4a95c 100644
--- a/jnlp-files/atomic/newt-noawt.jnlp
+++ b/jnlp-files/atomic/newt-noawt.jnlp
@@ -14,7 +14,7 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="jar/atomic/newt-core.jar" />
+      <jar href="jar/atomic/newt.jar" />
       <extension name="nativewindow" href="JOGL_CODEBASE_TAG/nativewindow-noawt.jnlp" />
     </resources>
 
-- 
cgit v1.2.3