From: Keith Packard Date: Sun, 7 Sep 2014 05:56:25 +0000 (-0700) Subject: altosui: Include EasyMega firmware in fat release X-Git-Tag: 1.4.9.3~1 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=445d61c3810154193aebbf0f08f075ac8e107baf;ds=sidebyside altosui: Include EasyMega firmware in fat release Signed-off-by: Keith Packard --- diff --git a/altosui/Makefile.am b/altosui/Makefile.am index 77be1640..48f58933 100644 --- a/altosui/Makefile.am +++ b/altosui/Makefile.am @@ -134,10 +134,13 @@ FIRMWARE_TMEGA=$(FIRMWARE_TMEGA_1_0) FIRMWARE_EMINI_1_0=$(top_srcdir)/src/easymini-v1.0/easymini-v1.0-$(VERSION).ihx FIRMWARE_EMINI=$(FIRMWARE_EMINI_1_0) +FIRMWARE_EMEGA_1_0=$(top_srcdir)/src/easymega-v1.0/easymega-v1.0-$(VERSION).ihx +FIRMWARE_EMEGA=$(FIRMWARE_EMEGA_1_0) + FIRMWARE_TGPS_1_0=$(top_srcdir)/src/telegps-v1.0/telegps-v1.0-$(VERSION).ihx FIRMWARE_TGPS=$(FIRMWARE_TGPS_1_0) -FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD) $(FIRMWARE_TBT) $(FIRMWARE_TMEGA) $(FIRMWARE_EMINI) $(FIRMWARE_TGPS) +FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD) $(FIRMWARE_TBT) $(FIRMWARE_TMEGA) $(FIRMWARE_EMINI) $(FIRMWARE_TGPS) $(FIRMWARE_EMEGA) ALTUSMETRUM_DOC=$(top_srcdir)/doc/altusmetrum.pdf ALTOS_DOC=$(top_srcdir)/doc/altos.pdf diff --git a/altosui/altos-windows.nsi.in b/altosui/altos-windows.nsi.in index 07de5b13..11c1dc07 100644 --- a/altosui/altos-windows.nsi.in +++ b/altosui/altos-windows.nsi.in @@ -115,7 +115,7 @@ Section "${REG_NAME} Desktop Shortcut" CreateShortCut "$DESKTOP\${REG_NAME}.lnk" "$INSTDIR\${FAT_NAME}" "" "$INSTDIR\${WIN_APP_ICON}" SectionEnd -Section "TeleMetrum, TeleDongle and TeleBT Firmware" +Section "Firmware" SetOutPath $INSTDIR @@ -129,6 +129,7 @@ Section "TeleMetrum, TeleDongle and TeleBT Firmware" File "../src/telebt-v1.0/telebt-v1.0-${VERSION}.ihx" File "../src/telemega-v1.0/telemega-v1.0-${VERSION}.ihx" File "../src/easymini-v1.0/easymini-v1.0-${VERSION}.ihx" + File "../src/easymega-v1.0/easymega-v1.0-${VERSION}.ihx" SectionEnd