X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosUILib.java;h=ccadf07cc851e8e678522b35bdd11a0d5cf1396f;hp=1b1214052f8f9598f46b8895456d6a3f95a23b76;hb=e2562ee43b8558df0836217ea3a187b36e2669b3;hpb=8d1d8d2a3c129cdbd55427bcda0f26715b02f1ee

diff --git a/altosuilib/AltosUILib.java b/altosuilib/AltosUILib.java
index 1b121405..ccadf07c 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_1;
+package org.altusmetrum.altosuilib_3;
 
 import java.awt.*;
 import libaltosJNI.*;
 
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_5.*;
 
 public class AltosUILib extends AltosLib {
 
@@ -80,22 +80,42 @@ public class AltosUILib extends AltosLib {
 
 	static public boolean initialized = false;
 	static public boolean loaded_library = false;
+	static public boolean has_bluetooth = false;
+
+	static final String[] library_names_32 = { "altos", "altos32", "altos64" };
+	static final String[] library_names_64 = { "altos", "altos64", "altos32" };
 
 	public static boolean load_library() {
 		if (!initialized) {
-			try {
-				System.loadLibrary("altos");
-				libaltos.altos_init();
-				loaded_library = true;
-			} catch (UnsatisfiedLinkError e) {
+			String model = System.getProperty("sun.arch.data.model", "missing");
+			boolean is_64 = false;
+			if (model.equals("64")) {
+				is_64 = true;
+			} else if (model.equals("32")) {
+				;
+			} else {
+				String arch = System.getProperty("os.arch", "missing");
+				if (arch.endsWith("64"))
+					is_64 = true;
+			}
+			for (String name : is_64 ? library_names_64 : library_names_32) {
 				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;
 				}
 			}
+
+			String OS = System.getProperty("os.name");
+
+			if (OS.startsWith("Linux")) {
+				has_bluetooth = true;
+			}
+
 			initialized = true;
 		}
 		return loaded_library;