From 233ea3b436581ef3b2f18f71e8874c7f6608fff0 Mon Sep 17 00:00:00 2001
From: Nate Weibley <nate.weibley@prioria.com>
Date: Fri, 4 Sep 2015 15:40:26 -0400
Subject: [PATCH] Update NSIS script to include ANGLE dlls for windows, add
 NSIS script to otherfiles on windows

---
 QGCInstaller.pri | 1 +
 QGCSetup.pri     | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/QGCInstaller.pri b/QGCInstaller.pri
index e529a62f1..b6d2caa1a 100644
--- a/QGCInstaller.pri
+++ b/QGCInstaller.pri
@@ -49,5 +49,6 @@ 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
     }
 }
diff --git a/QGCSetup.pri b/QGCSetup.pri
index 799f09f6a..e8d5ad42b 100644
--- a/QGCSetup.pri
+++ b/QGCSetup.pri
@@ -170,6 +170,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 \
@@ -198,7 +202,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\"
-- 
2.22.0