diff options
| author | Bdale Garbee <bdale@gag.com> | 2015-07-15 16:43:50 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2015-07-15 16:43:50 -0600 |
| commit | 643c2fb03833d658320f476ef731bbb06fe3cc31 (patch) | |
| tree | 878c9df5dbd9bab9169becea4e06e8bae3529541 /micropeak/Makefile.am | |
| parent | e41786fb384892961a6547e17812a24314ce9623 (diff) | |
| parent | 271f56a41c7e785b0fab7e572325df842d104277 (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'micropeak/Makefile.am')
| -rw-r--r-- | micropeak/Makefile.am | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am index 15865606..a8834a66 100644 --- a/micropeak/Makefile.am +++ b/micropeak/Makefile.am @@ -124,20 +124,29 @@ FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFR LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC) $(desktop_file).in $(LINUX_ICONS) $(LINUX_MIMETYPE) LINUX_EXTRA=micropeak-fat $(desktop_file).in -MACOSX_DRIVER_URL=http://www.ftdichip.com/Drivers/VCP/MacOSX/FTDIUSBSerialDriver_v2_2_18.dmg -MACOSX_DRIVER=FTDIUSBSerialDriver_v2_2_18.dmg +MACOSX_DRIVER_0_URL=http://www.ftdichip.com/Drivers/VCP/MacOSX/FTDIUSBSerialDriver_v2_2_18.dmg +MACOSX_DRIVER_0=FTDI_v2_2_18.dmg + +MACOSX_DRIVER_1_URL=http://www.ftdichip.com/Drivers/VCP/MacOSX/FTDIUSBSerialDriver_v2_3.dmg +MACOSX_DRIVER_1=FTDI_v2_3.dmg + +MACOSX_DRIVERS=$(MACOSX_DRIVER_1) $(MACOSX_DRIVER_0) + MACOSX_INFO_PLIST=Info.plist MACOSX_README=ReadMe-Mac.rtf -MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVER) $(MACOSX_README) $(DOC) $(MACOSX_ICONS) +MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVERS) $(MACOSX_README) $(DOC) $(MACOSX_ICONS) + +$(MACOSX_DRIVER_0): + wget -O $@ $(MACOSX_DRIVER_0_URL) -$(MACOSX_DRIVER): - wget $(MACOSX_DRIVER_URL) +$(MACOSX_DRIVER_1): + wget -O $@ $(MACOSX_DRIVER_1_URL) -WINDOWS_DRIVER_URL=http://www.ftdichip.com/Drivers/CDM/CDM20824_Setup.exe -WINDOWS_DRIVER=CDM20824_Setup.exe +WINDOWS_DRIVER_URL=http://www.ftdichip.com/Drivers/CDM/CDM%20v2.12.00%20WHQL%20Certified.exe +WINDOWS_DRIVER=CDM_v2.12.00_WHQL_Certified.exe $(WINDOWS_DRIVER): - wget $(WINDOWS_DRIVER_URL) + wget -O "$(WINDOWS_DRIVER)" "$(WINDOWS_DRIVER_URL)" WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(DOC) $(WINDOWS_ICONS) $(WINDOWS_DRIVER) @@ -274,7 +283,7 @@ $(MACOSX_DIST): $(MACOSX_FILES) cp -a $(MACOSX_README) macosx/ReadMe.rtf cp -a $(DOC) macosx cp -p Info.plist macosx/MicroPeak.app/Contents - cp -p $(MACOSX_DRIVER) macosx + cp -p $(MACOSX_DRIVERS) macosx mkdir -p macosx/MicroPeak.app/Contents/Resources/Java cp -p $(MACOSX_ICONS) macosx/MicroPeak.app/Contents/Resources cp -p $(FATJAR) macosx/MicroPeak.app/Contents/Resources/Java/micropeak.jar |