diff options
| author | Keith Packard <keithp@keithp.com> | 2013-03-06 21:53:22 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-03-06 21:53:22 -0800 |
| commit | 760b1f02c178c600226f39b5e66d8cbadbf4a29b (patch) | |
| tree | 8edee60099f6bf067009a325858e170d5506ba33 /micropeak | |
| parent | afd2674261e128a0ecff8fbf5dd6a64196b026f6 (diff) | |
| parent | cbad587b49c565edd2c9356a015d6cfd52df93a3 (diff) | |
Merge remote-tracking branch 'mjb/master'
Diffstat (limited to 'micropeak')
| -rw-r--r-- | micropeak/.gitignore | 2 | ||||
| -rw-r--r-- | micropeak/Makefile.am | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/micropeak/.gitignore b/micropeak/.gitignore index ab80492b..6a6475f0 100644 --- a/micropeak/.gitignore +++ b/micropeak/.gitignore @@ -7,6 +7,7 @@ micropeak micropeak-test micropeak-jdb micropeak-windows.log +micropeak-windows.nsi MicroPeak-Linux-* MicroPeak-Mac-* MicroPeak-Windows-* @@ -17,3 +18,4 @@ linux macosx CDM*.exe FTDI*.dmg +Info.plist diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am index d45ecab9..098a00fb 100644 --- a/micropeak/Makefile.am +++ b/micropeak/Makefile.am @@ -78,7 +78,8 @@ clean-local: $(ALTOSLIB_CLASS) \ $(ALTOSUILIB_CLASS) \ $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt \ - micropeak micropeak-test micropeak-jdb macosx linux windows micropeak-windows.log + micropeak micropeak-test micropeak-jdb macosx linux windows micropeak-windows.log \ + micropeak-windows.nsi LINUX_DIST=MicroPeak-Linux-$(VERSION).tar.bz2 MACOSX_DIST=MicroPeak-Mac-$(VERSION).dmg |