summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2014-06-14 18:06:36 -0700
committerKeith Packard <keithp@keithp.com>2014-06-14 18:06:36 -0700
commit66c4a091bb6a294f9d406e75f3634492c886d139 (patch)
tree647c778faca0a523594196b7066ac73a7d9de70a
parentb825ea71ebcc4a8da3e339ab3e21b0ad47f2e48f (diff)
altosui: Build MacOSX icon from svg
Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--altosui/AltosUI.app/Contents/Resources/AltosUIIcon.icnsbin129010 -> 0 bytes
-rw-r--r--altosui/Makefile.am4
2 files changed, 3 insertions, 1 deletions
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
--- a/altosui/AltosUI.app/Contents/Resources/AltosUIIcon.icns
+++ /dev/null
Binary files 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