X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosUILib.java;h=ef706e364c2dabd5af947c53af40e4335ca16211;hp=76782e2e565743072940d96f63c6f90cbfe9793e;hb=a61217f0a6d0ef48b6471f632c4600255867e831;hpb=f118e33416e45ea9a2b5ede4157bd8b58ddb6ebb

diff --git a/altosuilib/AltosUILib.java b/altosuilib/AltosUILib.java
index 76782e2e..ef706e36 100644
--- a/altosuilib/AltosUILib.java
+++ b/altosuilib/AltosUILib.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,12 +16,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_12;
 
 import java.awt.*;
 import libaltosJNI.*;
 
-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_12.*;
 
 public class AltosUILib extends AltosLib {
 
@@ -80,12 +81,25 @@ 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 = { "altos", "altos32", "altos64" };
+	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) {
-			for (String name : library_names) {
+			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(name);
 					libaltos.altos_init();
@@ -96,6 +110,12 @@ public class AltosUILib extends AltosLib {
 					loaded_library = false;
 				}
 			}
+
+			String OS = System.getProperty("os.name");
+
+			if (OS.startsWith("L") || OS.startsWith("W"))
+				has_bluetooth = true;
+
 			initialized = true;
 		}
 		return loaded_library;