X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FMakefile;h=541b89e3847128bd0c21fb0663bfb8ff4e852673;hp=2a91d657a11a8f5cbabe5e373a8bc32766bd05bf;hb=953bc3438b10b21f3d65d292356c4ab2de23cddd;hpb=6599e9576c3da9325a1731144c1b8bc4943184c0

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index 2a91d657..541b89e3 100644
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -2,18 +2,30 @@
 
 CLASSPATH=classes:./*
 CLASSFILES=\
+	Altos.class \
+	AltosChannelMenu.class \
+	AltosConfig.class \
+	AltosConfigUI.class \
 	AltosConvert.class \
-	AltosEeprom.class \
+	AltosCSV.class \
+	AltosEepromDownload.class \
+	AltosEepromMonitor.class \
+	AltosEepromReader.class \
+	AltosEepromRecord.class \
 	AltosFile.class \
+	AltosFlightInfoTableModel.class \
+	AltosFlightStatusTableModel.class \
 	AltosGPS.class \
 	AltosGreatCircle.class \
 	AltosLog.class \
 	AltosParse.class \
 	AltosPreferences.class \
+	AltosRecord.class \
 	AltosSerialMonitor.class \
 	AltosSerial.class \
 	AltosState.class \
 	AltosTelemetry.class \
+	AltosTelemetryReader.class \
 	AltosUI.class \
 	AltosDevice.class \
 	AltosDeviceDialog.class \
@@ -28,13 +40,21 @@ FREETTSJAR= \
 	cmutimelex.jar \
 	cmu_us_kal.jar \
 	en_us.jar \
-	freetts.jar \
-	freetts-jsapi10.jar \
-	jsapi.jar
+	freetts.jar
 
-JAVAFLAGS=-Xlint:unchecked
+JAVAFLAGS=-Xlint:unchecked -Xlint:deprecation
 
-all: altosui.jar
+OS:=$(shell uname)
+
+ifeq ($(OS),Linux)
+ALTOSUI_APP=altosui
+endif
+
+ifeq ($(OS),Darwin)
+ALTOSUI_APP=AltosUI.app/Contents/Resources/Java/altosui.jar
+endif
+
+all: altosui.jar $(ALTOSUI_APP)
 
 $(CLASSFILES):
 
@@ -55,6 +75,23 @@ classes/libaltosJNI:
 $(FREETTSJAR):
 	ln -s $(FREETTSLIB)/$@ .
 
+ifeq ($(OS),Darwin)
+RESOURCES=altosui.jar $(FREETTSJAR) ../libaltos/libaltos.dylib
+
+$(ALTOSUI_APP): $(RESOURCES)
+	mkdir -p AltosUI.app/Contents/Resources/Java
+	cp $(RESOURCES) AltosUI.app/Contents/Resources/Java
+
+endif
+
+ifeq ($(OS),Linux)
+altosui:
+	echo "#!/bin/sh" > $@
+	echo "exec java -Djava.library.path=../libaltos -jar altosui.jar" >> $@
+	chmod +x ./altosui
+endif
+
 clean:
 	rm -f *.class $(FREETTSJAR) altosui.jar
+	rm -f AltosUI.app/Contents/Resources/Java/*
 	rm -rf classes