From: Jim Procter <jprocter@dundee.ac.uk>
Date: Thu, 5 Feb 2015 10:51:18 +0000 (+0000)
Subject: JAL-1643 jarred up the quaqua native libraries and added nativelib
X-Git-Tag: Jalview_2_9~86^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=977eba6d0cdd5683a583d1ad39abf83e0c68d3ac;p=jalview.git

JAL-1643 jarred up the quaqua native libraries and added nativelib
resource tags for Mac OS X
---

diff --git a/build.xml b/build.xml
index d8ebe1e..478e936 100755
--- a/build.xml
+++ b/build.xml
@@ -349,9 +349,14 @@
             <include name="*.jar" />
             <include name="*_*.jar" />
             <exclude name="jalview.jar" />
+          	<exclude name="*jnilib.jar"/>
           </fileset>
           <property name="jalview.version" value="${JALVIEW_VERSION}" />
+        	<fileset dir="${packageDir}" os="Mac OS X">
+        		<include name="*quaqua*.jnilib.jar"/>
+        	</fileset>
         </resources>
+      	
         <application_desc main_class="jalview.bin.Jalview">
         </application_desc>
         <security>
diff --git a/lib/libquaqua-8.0.jnilib.jar b/lib/libquaqua-8.0.jnilib.jar
new file mode 100644
index 0000000..79383b0
Binary files /dev/null and b/lib/libquaqua-8.0.jnilib.jar differ
diff --git a/lib/libquaqua.jnilib b/lib/libquaqua.jnilib
deleted file mode 100644
index a3c9e8a..0000000
Binary files a/lib/libquaqua.jnilib and /dev/null differ
diff --git a/lib/libquaqua64-8.0.jnilib.jar b/lib/libquaqua64-8.0.jnilib.jar
new file mode 100644
index 0000000..efb46a4
Binary files /dev/null and b/lib/libquaqua64-8.0.jnilib.jar differ
diff --git a/lib/libquaqua64.jnilib b/lib/libquaqua64.jnilib
deleted file mode 100644
index 5378540..0000000
Binary files a/lib/libquaqua64.jnilib and /dev/null differ