From: Keith Packard <keithp@keithp.com>
Date: Sun, 15 Jun 2014 01:06:36 +0000 (-0700)
Subject: altosui: Build MacOSX icon from svg
X-Git-Tag: 1.4~21
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=66c4a091bb6a294f9d406e75f3634492c886d139;ds=sidebyside

altosui: Build MacOSX icon from svg

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altosui/AltosUI.app/Contents/Resources/AltosUIIcon.icns b/altosui/AltosUI.app/Contents/Resources/AltosUIIcon.icns
deleted file mode 100644
index fe49f362..00000000
Binary files a/altosui/AltosUI.app/Contents/Resources/AltosUIIcon.icns and /dev/null differ
diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index be817cb8..0300513e 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -91,6 +91,7 @@ ICONJAR= -C $(ICONDIR) altus-metrum-16.png \
 	-C $(ICONDIR) altus-metrum-256.png
 
 WINDOWS_ICON=$(ICONDIR)/altus-metrum.ico
+MACOSX_ICON=$(ICONDIR)/AltosUIIcon.icns
 
 # Firmware
 FIRMWARE_TD_0_2=$(top_srcdir)/src/teledongle-v0.2/teledongle-v0.2-$(VERSION).ihx
@@ -140,7 +141,7 @@ LINUX_FILES=$(FAT_FILES) $(LINUX_LIBS) $(FIRMWARE) $(DOC) altos.desktop.in ../ic
 LINUX_EXTRA=altosui-fat
 
 MACOSX_INFO_PLIST=Info.plist
-MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(DOC) ReadMe-Mac.rtf
+MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(DOC) ReadMe-Mac.rtf $(MACOSX_ICON)
 MACOSX_EXTRA=$(FIRMWARE)
 
 WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
@@ -320,6 +321,7 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA) Makefile
 	cp -a $(DOC) macosx/Doc
 	cp -p Info.plist macosx/AltosUI.app/Contents
 	mkdir -p macosx/AltOS-$(VERSION) macosx/AltosUI.app/Contents/Resources/Java
+	cp -p $(MACOSX_ICON) macosx/AltosUI.app/Contents/Resources
 	cp -p $(FATJAR) macosx/AltosUI.app/Contents/Resources/Java/altosui.jar
 	cp -p libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
 	cp -p $(ALTOSLIB_CLASS) macosx/AltosUI.app/Contents/Resources/Java