X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosUILib.java;fp=altosuilib%2FAltosUILib.java;h=a0cf325d8543ed1f2afcc33e941a8de50eec1dc8;hp=97a9067a5ee2d7d72033531ccabf85c23deece0e;hb=dc765b10da7f1dc8e267bcd70b4dcee243475c83;hpb=772b15425317d1da231c9925839320721cdb1269

diff --git a/altosuilib/AltosUILib.java b/altosuilib/AltosUILib.java
index 97a9067a..a0cf325d 100644
--- a/altosuilib/AltosUILib.java
+++ b/altosuilib/AltosUILib.java
@@ -89,23 +89,20 @@ public class AltosUILib extends AltosLib {
 	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" };
+	static final String[] library_names = {
+		"altos",
+		"altos32",
+		"altos64",
+		"altos_i686",
+		"altos_amd64",
+		"altos_aarch64",
+		"altos_armel",
+		"altos_armhf"
+	};
 
 	public static boolean load_library() {
 		if (!initialized) {
-			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) {
+			for (String name : library_names) {
 				try {
 					System.loadLibrary(name);
 					libaltos.altos_init();