X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=ao-tools%2Faltosui%2FMakefile;h=bae42c9ac14cd41d565db70cbe568bf03938abc0;hb=aed55ef1ce45b0f6e6fefeebf50be97607b31d65;hp=57c889b8d37c3d1c335221791289b65178d2bdc5;hpb=563a9dcdfef42718370c49f16cc2271642b3e055;p=fw%2Faltos

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index 57c889b8..bae42c9a 100644
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -1,8 +1,10 @@
 .SUFFIXES: .java .class
 
-CLASSPATH=..:/usr/share/java/*:/home/keithp/src/freetts/freetts-1.2.2
+CLASSPATH=classes:./*:/usr/share/java/*
 CLASSFILES=\
 	AltosConvert.class \
+	AltosEeprom.class \
+	AltosEepromMonitor.class \
 	AltosFile.class \
 	AltosGPS.class \
 	AltosGreatCircle.class \
@@ -15,24 +17,71 @@ CLASSFILES=\
 	AltosTelemetry.class \
 	AltosUI.class \
 	AltosDevice.class \
-	AltosDeviceLinux.class \
 	AltosDeviceDialog.class \
 	AltosVoice.class
 
+#FREETTSSRC=/home/keithp/src/freetts/freetts-1.2.2
+#FREETTSLIB=$(FREETTSSRC)/lib
+#FREETTSJAR=/usr/share/java/freetts.jar
+#FREETTSJAR= \
+#	cmudict04.jar \
+#	cmulex.jar \
+#	cmu_time_awb.jar \
+#	cmutimelex.jar \
+#	cmu_us_kal.jar \
+#	en_us.jar \
+#	freetts.jar
+
 JAVAFLAGS=-Xlint:unchecked
 
-all: $(CLASSFILES) altosui 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):
 
 .java.class:
-	javac -cp "$(CLASSPATH)" $(JAVAFLAGS) $*.java
+	javac -encoding UTF8 -classpath "$(CLASSPATH)" $(JAVAFLAGS) $*.java
+
+altosui.jar: classes/altosui classes/libaltosJNI $(FREETTSJAR) $(CLASSFILES) Manifest.txt
+	cd ./classes && jar cfm ../$@ altosui/Manifest.txt altosui/*.class libaltosJNI/*.class
+
+classes/altosui:
+	mkdir -p classes
+	ln -sf .. classes/altosui
+
+classes/libaltosJNI:
+	mkdir -p classes
+	ln -sf ../../libaltos/libaltosJNI 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
 
-altosui: Makefile
-	(echo '#!/bin/sh'; \
-	echo exec java -cp '"$(CLASSPATH)"' altosui/AltosUI) > $@
-	chmod +x $@
+endif
 
-altosui.jar: $(CLASSFILES) Manifest.txt
-	cd .. && jar cfm altosui/$@ altosui/Manifest.txt altosui/*.class
+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
+	rm -f *.class altosui.jar
+	rm -f AltosUI.app/Contents/Resources/Java/*
+	rm -rf classes