altosui: Attempt to make both 32- and 64-bit windows DLLs

[fw/altos] / altosui / Altos.java

diff --git a/altosui/Altos.java b/altosui/Altos.java
index 416d93284122db99e66f6ac0e696714b5ded2aec..ddf1005a3ed2aad1703a7290ab8905f86b9c79a4 100644 (file)
--- a/altosui/Altos.java
+++ b/altosui/Altos.java
@@ -112,6 +112,7 @@ public class Altos {
                string_to_state.put("fast", ao_flight_fast);
                string_to_state.put("coast", ao_flight_coast);
                string_to_state.put("drogue", ao_flight_drogue);
+               string_to_state.put("apogee", ao_flight_coast);
                string_to_state.put("main", ao_flight_main);
                string_to_state.put("landed", ao_flight_landed);
                string_to_state.put("invalid", ao_flight_invalid);
@@ -365,7 +366,13 @@ public class Altos {
                                libaltos.altos_init();
                                loaded_library = true;
                        } catch (UnsatisfiedLinkError e) {
-                               loaded_library = false;
+                               try {
+                                       System.loadLibrary("altos64");
+                                       libaltos.altos_init();
+                                       loaded_library = true;
+                               } catch (UnsatisfiedLinkError e2) {
+                                       loaded_library = false;
+                               }
                        }
                        initialized = true;
                }