[PATCH 2/6] Tell NSIS to search for the DLLs in packaging/windows

Thiago Macieira thiago at macieira.org
Wed Nov 27 17:42:46 UTC 2013


The "make install" step will copy all we depend on DLLs there.

Signed-off-by: Thiago Macieira <thiago at macieira.org>
---
 packaging/windows/subsurface.nsi.in | 46 ++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/packaging/windows/subsurface.nsi.in b/packaging/windows/subsurface.nsi.in
index 67a40c5..ced5dc3 100644
--- a/packaging/windows/subsurface.nsi.in
+++ b/packaging/windows/subsurface.nsi.in
@@ -103,29 +103,29 @@ Section
     File /r data
     File /r images
     File /r icons
-    File dll\iconv.dll
-    File dll\libdivecomputer-0.dll
-    File dll\libintl-8.dll
-    File dll\libpng15-15.dll
-    File dll\libusb-1.0.dll
-    File dll\libxml2-2.dll
-    File dll\libxslt-1.dll
-    File dll\zlib1.dll
-    File dll\libzip-2.dll
-    File dll\libsqlite3-0.dll
-    File dll\libgcc_s_sjlj-1.dll
-    File dll\libstdc++-6.dll
-    File dll\QtCore4.dll
-    File dll\QtGui4.dll
-    File dll\QtNetwork4.dll
-    File dll\QtSvg4.dll
-    File dll\QtWebKit4.dll
-    File dll\QtDeclarative4.dll
-    File dll\QtScript4.dll
-    File dll\QtSql4.dll
-    File dll\QtXmlPatterns4.dll
-    File dll\QtXml4.dll
-    File dll\libmarblewidget.dll
+    File iconv.dll
+    File libdivecomputer-0.dll
+    File libintl-8.dll
+    File libpng15-15.dll
+    File libusb-1.0.dll
+    File libxml2-2.dll
+    File libxslt-1.dll
+    File zlib1.dll
+    File libzip-2.dll
+    File libsqlite3-0.dll
+    File libgcc_s_sjlj-1.dll
+    File libstdc++-6.dll
+    File QtCore4.dll
+    File QtGui4.dll
+    File QtNetwork4.dll
+    File QtSvg4.dll
+    File QtWebKit4.dll
+    File QtDeclarative4.dll
+    File QtScript4.dll
+    File QtSql4.dll
+    File QtXmlPatterns4.dll
+    File QtXml4.dll
+    File libmarblewidget.dll
     File subsurface.ico
 
     # Store installation folder in registry
-- 
1.7.11.7



More information about the subsurface mailing list