From 184909e229c3e7b702099d69c0192c500d750e68 Mon Sep 17 00:00:00 2001
From: Kevin Smith <git@kismith.co.uk>
Date: Sat, 5 Nov 2011 22:27:52 +0000
Subject: Assume Windows packaging doesn't include openssl


diff --git a/Swift/Packaging/nsis/swift.nsi b/Swift/Packaging/nsis/swift.nsi
index a5cc71a..92c65c4 100644
--- a/Swift/Packaging/nsis/swift.nsi
+++ b/Swift/Packaging/nsis/swift.nsi
@@ -58,8 +58,8 @@ setOutPath $INSTDIR
 # Specify files to go in output path.
 # If you update this list, update the uninstall list too.
 File "..\..\QtUI\Swift\Swift.exe"
-File "..\..\QtUI\Swift\ssleay32.dll"
-File "..\..\QtUI\Swift\libeay32.dll"
+#File "..\..\QtUI\Swift\ssleay32.dll"
+#File "..\..\QtUI\Swift\libeay32.dll"
 File "..\..\QtUI\Swift\phonon4.dll"
 File "..\..\QtUI\Swift\QtCore4.dll"
 File "..\..\QtUI\Swift\QtGui4.dll"
@@ -139,8 +139,8 @@ section "Uninstall"
  
     # now delete installed files
     delete $INSTDIR\Swift.exe
-    delete $INSTDIR\ssleay32.dll
-    delete $INSTDIR\libeay32.dll
+    #delete $INSTDIR\ssleay32.dll
+    #delete $INSTDIR\libeay32.dll
     delete $INSTDIR\phonon4.dll
     delete $INSTDIR\QtCore4.dll
     delete $INSTDIR\QtGui4.dll
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 932a1fa..a62e14c 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -254,8 +254,8 @@ if env.get("SWIFT_INSTALLDIR", "") :
 if env["PLATFORM"] == "win32" :
   if env["DIST"] :
     commonResources[""] = commonResources.get("", []) + [
-        os.path.join(env["OPENSSL_DIR"], "bin", "ssleay32.dll"),  
-        os.path.join(env["OPENSSL_DIR"], "bin", "libeay32.dll"),
+        #os.path.join(env["OPENSSL_DIR"], "bin", "ssleay32.dll"),  
+        #os.path.join(env["OPENSSL_DIR"], "bin", "libeay32.dll"),
         "#/Swift/resources/images",  
       ]
     myenv.WindowsBundle("Swift", 
-- 
cgit v0.10.2-6-g49f6