X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FMakefile;h=8c9e9642fbad134d530da4ec989c5ebc89fa5709;hb=22800dc094797e1e0ad99124198809d0360f7556;hp=aa0278a824d24183a12765eec6d5a3f7325362a5;hpb=809feb75e2155e84aebfcc431867edcfd9054670;p=fw%2Faltos

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index aa0278a8..8c9e9642 100644
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -2,17 +2,27 @@
 
 CLASSPATH=classes:./*
 CLASSFILES=\
+	Altos.class \
 	AltosConvert.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 \
@@ -27,20 +37,28 @@ FREETTSJAR= \
 	cmutimelex.jar \
 	cmu_us_kal.jar \
 	en_us.jar \
-	freetts.jar \
-	freetts-jsapi10.jar \
-	jsapi.jar
+	freetts.jar
 
 JAVAFLAGS=-Xlint:unchecked
 
-all: altosui.jar
+OS:=$(shell uname)
 
-$(CLASSFILES): classes/altosui classes/libaltosJNI $(FREETTSJAR)
+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):
 
 .java.class:
-	javac -cp "$(CLASSPATH)" $(JAVAFLAGS) $*.java
+	javac -encoding UTF8 -classpath "$(CLASSPATH)" $(JAVAFLAGS) $*.java
 
-altosui.jar: $(CLASSFILES) Manifest.txt
+altosui.jar: classes/altosui classes/libaltosJNI $(FREETTSJAR) $(CLASSFILES) Manifest.txt
 	cd ./classes && jar cfm ../$@ altosui/Manifest.txt altosui/*.class libaltosJNI/*.class
 
 classes/altosui:
@@ -54,6 +72,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