From 702fe1f49f05f3e84304ccc1dae45b3d70e51f2a Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Thu, 10 Sep 2015 14:45:30 -0400
Subject: [PATCH] Revert "Update NSIS script to include ANGLE dlls for windows,
add NSIS script to otherfiles on windows"
This partially reverts commit 233ea3b436581ef3b2f18f71e8874c7f6608fff0.
---
QGCSetup.pri | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/QGCSetup.pri b/QGCSetup.pri
index 02b2e4e..3251240 100644
--- a/QGCSetup.pri
+++ b/QGCSetup.pri
@@ -166,10 +166,6 @@ 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 \
@@ -191,6 +187,11 @@ WindowsBuild {
$$DLL_DIR\\Qt5WebKitWidgets$${DLL_QT_DEBUGCHAR}.dll \
$$DLL_DIR\\Qt5Widgets$${DLL_QT_DEBUGCHAR}.dll \
$$DLL_DIR\\Qt5Xml$${DLL_QT_DEBUGCHAR}.dll
+# readd this with Qt 5.5
+# $$DLL_DIR\\d3dcompiler*.dll \
+# $$DLL_DIR\\libEGL$${DLL_QT_DEBUGCHAR}.dll \
+# $$DLL_DIR\\libGLESv2$${DLL_QT_DEBUGCHAR}.dll \
+# $$DLL_DIR\\opengl32sw.dll \
for(COPY_FILE, COPY_FILE_LIST) {
QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$COPY_FILE\" \"$$DESTDIR_WIN\"
}