Also bundle avrdude in addition to dfu-util and default to the executables in the bundle (#4106)

This commit is contained in:
Arne Schwabe
2016-12-08 21:22:12 +01:00
committed by Bertrand Songis
parent 3f4502d970
commit dd77670007
2 changed files with 8 additions and 7 deletions
+2 -2
View File
@@ -120,11 +120,11 @@ void burnConfigDialog::getSettings()
dfuLoc = QFileInfo("dfu-util.exe").absoluteFilePath();
#elif defined __APPLE__
if ( avrLoc.isEmpty())
avrLoc = "/usr/local/bin/avrdude";
avrLoc = QFileInfo(QApplication::applicationDirPath() + "/../Resources/avrdude").absoluteFilePath();
if ( sambaLoc.isEmpty())
sambaLoc = "/usr/local/bin/sam-ba";
if ( dfuLoc.isEmpty())
dfuLoc = QFileInfo("/opt/local/bin/dfu-util").absoluteFilePath();
dfuLoc = QFileInfo(QApplication::applicationDirPath() + "/../Resources/dfu-util").absoluteFilePath();
#else
if ( avrLoc.isEmpty())
avrLoc = "/usr/bin/avrdude";