X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FMakefile;h=92f0e69066ed8d14de59fee4609f31d6dadefc95;hp=852710394c01f8d23ff97dffcb2895ad8b904379;hb=f550677df016070430ed38bfa2b2be33f1b8c40a;hpb=3aafd70257b70b7c11ba9c55749157979bc61ea2

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index 85271039..92f0e690 100644
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -7,6 +7,7 @@ CLASSFILES=\
 	AltosConfig.class \
 	AltosConfigUI.class \
 	AltosConvert.class \
+	AltosCRCException.class \
 	AltosCSV.class \
 	AltosCSVUI.class \
 	AltosDebug.class \
@@ -22,6 +23,7 @@ CLASSFILES=\
 	AltosGPS.class \
 	AltosGreatCircle.class \
 	AltosHexfile.class \
+	AltosLine.class \
 	AltosLog.class \
 	AltosLogfileChooser.class \
 	AltosParse.class \
@@ -73,12 +75,12 @@ LINUX_APP=altosui
 
 DARWIN_ZIP=Altos-Mac.zip
 
-WINDOWS_ZIP=Altos-Windows.zip
+WINDOWS_EXE=Altos-Windows.exe
 
 LINUX_TGZ=Altos-Linux.tgz
 
 all: altosui.jar $(LINUX_APP)
-fat: altosui.jar $(LINUX_APP) $(DARWIN_ZIP) $(WINDOWS_ZIP) $(LINUX_TGZ)
+fat: altosui.jar $(LINUX_APP) $(DARWIN_ZIP) $(WINDOWS_EXE) $(LINUX_TGZ)
 
 $(CLASSFILES):
 
@@ -135,7 +137,8 @@ clean:
 	rm -rf windows linux
 
 distclean:	clean
-	rm -f $(DARWIN_ZIP) $(WINDOWS_ZIP) $(LINUX_TGZ)
+	rm -f $(DARWIN_ZIP) $(WINDOWS_EXE) $(LINUX_TGZ)
+	rm -rf darwin fat
 
 FAT_FILES=$(FATJAR) $(FREETTSJAR) $(HEXFILES)
 
@@ -158,13 +161,13 @@ $(DARWIN_ZIP): $(DARWIN_FILES)
 	cp $(DARWIN_RESOURCES) darwin/AltosUI.app/Contents/Resources/Java
 	mkdir -p darwin/AltOS
 	cp $(DARWIN_EXTRA) darwin/AltOS
-	cd darwin && zip -j -r ../$@ AltosUI.app AltOS
+	cd darwin && zip -r ../$@ AltosUI.app AltOS
 
 WINDOWS_FILES = $(FAT_FILES) ../libaltos/altos.dll ../../telemetrum.inf
 
-$(WINDOWS_ZIP): $(WINDOWS_FILES)
+$(WINDOWS_EXE): $(WINDOWS_FILES) altos-windows.nsi
 	rm -f $@
 	mkdir -p windows/AltOS
 	rm -f windows/AltOS/*
 	cp $(WINDOWS_FILES) windows/AltOS
-	cd windows && zip -j -r ../$@ AltOS
+	makensis altos-windows.nsi