summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2011-11-05 22:27:52 (GMT)
committerKevin Smith <git@kismith.co.uk>2011-11-05 22:49:42 (GMT)
commit184909e229c3e7b702099d69c0192c500d750e68 (patch)
tree8e98e8b45830ed1713f3339a91307659fba1e916
parent0b56244a3efbd20fa28c63bffad32165283a42df (diff)
downloadswift-contrib-184909e229c3e7b702099d69c0192c500d750e68.zip
swift-contrib-184909e229c3e7b702099d69c0192c500d750e68.tar.bz2
Assume Windows packaging doesn't include openssl
-rw-r--r--Swift/Packaging/nsis/swift.nsi8
-rw-r--r--Swift/QtUI/SConscript4
2 files changed, 6 insertions, 6 deletions
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",