Merge pull request #1835 from Prioria/bugfixes

Update NSIS script to include ANGLE dlls for windows, add NSIS script…

QGCInstaller.pri

@@ -49,6 +49,7 @@ installer {
         QMAKE_POST_LINK += $$escape_expand(\\n) $$quote("\"C:\\Program Files \(x86\)\\NSIS\\makensis.exe\"" /NOCD "\"/XOutFile $${DESTDIR_WIN}\\qgroundcontrol-installer-win32.exe\"" "$$BASEDIR_WIN\\deploy\\qgroundcontrol_installer.nsi")
 		#QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY qgroundcontrol.pdb $${DESTDIR_WIN}
 		#QMAKE_POST_LINK += $$escape_expand(\\n) del qgroundcontrol.pdb
+        OTHER_FILES += deploy/qgroundcontrol_installer.nsi
     }
     LinuxBuild {
         QMAKE_POST_LINK += && tar -cjf qgroundcontrol.tar.bz2 release --transform 's/release/qgroundcontrol/'

QGCSetup.pri

@@ -166,6 +166,10 @@ WindowsBuild {
         $$BASEDIR\\libs\\lib\\sdl\\win32\\SDL.dll \
         $$BASEDIR\\libs\\thirdParty\\libxbee\\lib\\libxbee.dll \
         $$DLL_DIR\\icu*.dll \
+        $$DLL_DIR\\d3dcompiler*.dll \
+        $$DLL_DIR\\libEGL$${DLL_QT_DEBUGCHAR}.dll \
+        $$DLL_DIR\\libGLESv2$${DLL_QT_DEBUGCHAR}.dll \
+        $$DLL_DIR\\opengl32sw.dll \
         $$DLL_DIR\\Qt5Core$${DLL_QT_DEBUGCHAR}.dll \
         $$DLL_DIR\\Qt5Gui$${DLL_QT_DEBUGCHAR}.dll \
         $$DLL_DIR\\Qt5Location$${DLL_QT_DEBUGCHAR}.dll \
@@ -194,7 +198,7 @@ WindowsBuild {
     # Copy platform plugins
     P_DIR = $$[QT_INSTALL_PLUGINS]
     PLUGINS_DIR_WIN = $$replace(P_DIR, "/", "\\")
-    QMAKE_POST_LINK += $$escape_expand(\\n) mkdir "$$DESTDIR_WIN\\platforms"
+    QMAKE_POST_LINK += $$escape_expand(\\n) mkdir -p "$$DESTDIR_WIN\\platforms"
     QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY     \"$$PLUGINS_DIR_WIN\\platforms\\qwindows$${DLL_QT_DEBUGCHAR}.dll\" \"$$DESTDIR_WIN\\platforms\\qwindows$${DLL_QT_DEBUGCHAR}.dll\"
     QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY_DIR \"$$PLUGINS_DIR_WIN\\imageformats\" \"$$DESTDIR_WIN\\imageformats\"
     QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY_DIR \"$$PLUGINS_DIR_WIN\\sqldrivers\" \"$$DESTDIR_WIN\\sqldrivers\"