Merge pull request #1389 from DonLakeFlyer/WindowsUSBInstall

Install USB drivers

Merge pull request #1389 from DonLakeFlyer/WindowsUSBInstall
Install USB drivers
04a12284 · Don Gagne · 3fafb8bb · 955d9865 · 04a12284 · 04a12284
Commit 04a12284 authored Mar 26, 2015 by Don Gagne
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

px4driver.msi deploy/px4driver.msi +0 -0

qgroundcontrol_installer.nsi deploy/qgroundcontrol_installer.nsi +2 -0

No files found.
--- a/deploy/px4driver.msi
+++ b/deploy/px4driver.msi
--- a/deploy/qgroundcontrol_installer.nsi
+++ b/deploy/qgroundcontrol_installer.nsi
@@ -14,9 +14,11 @@ LicenseData license.txt
 Section
  SetOutPath $INSTDIR
  File /r release\*.*
+  File deploy\px4driver.msi
  WriteUninstaller $INSTDIR\QGroundControl_uninstall.exe
  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\QGroundControl" "DisplayName" "QGroundControl"
  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\QGroundControl" "UninstallString" "$\"$INSTDIR\QGroundControl_uninstall.exe$\""
+  ExecWait '"msiexec" /i "px4driver.msi"'
 SectionEnd 

 Section "Uninstall"