X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosUILib.java;h=0050f12c24e9471c871e459cfb13693540daa051;hp=e9daf821755509b5846a3005e70c9fe0a436de74;hb=c8078d352a7f54a4a97d25af080155d3f875536a;hpb=5a3c5de6657d1c26e52015a8acec0cd05e294cef

diff --git a/altosuilib/AltosUILib.java b/altosuilib/AltosUILib.java
index e9daf821..0050f12c 100644
--- a/altosuilib/AltosUILib.java
+++ b/altosuilib/AltosUILib.java
@@ -15,12 +15,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib;
+package org.altusmetrum.altosuilib_3;
 
 import java.awt.*;
 import libaltosJNI.*;
 
-import org.altusmetrum.altoslib.*;
+import org.altusmetrum.altoslib_5.*;
 
 public class AltosUILib extends AltosLib {
 
@@ -81,18 +81,18 @@ public class AltosUILib extends AltosLib {
 	static public boolean initialized = false;
 	static public boolean loaded_library = false;
 
+	static final String[] library_names = { "altos", "altos32", "altos64" };
+
 	public static boolean load_library() {
 		if (!initialized) {
-			try {
-				System.loadLibrary("altos");
-				libaltos.altos_init();
-				loaded_library = true;
-			} catch (UnsatisfiedLinkError e) {
+			for (String name : library_names) {
 				try {
-					System.loadLibrary("altos64");
+					System.loadLibrary(name);
 					libaltos.altos_init();
 					loaded_library = true;
-				} catch (UnsatisfiedLinkError e2) {
+					break;
+				} catch (UnsatisfiedLinkError e) {
+					System.out.printf("Link error %s\n", e.getMessage());
 					loaded_library = false;
 				}
 			}