Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2011-11-05 22:27:52 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2011-11-05 22:49:42 (GMT) |
| commit | 184909e229c3e7b702099d69c0192c500d750e68 (patch) | |
| tree | 8e98e8b45830ed1713f3339a91307659fba1e916 /Swift | |
| parent | 0b56244a3efbd20fa28c63bffad32165283a42df (diff) | |
| download | swift-contrib-184909e229c3e7b702099d69c0192c500d750e68.zip swift-contrib-184909e229c3e7b702099d69c0192c500d750e68.tar.bz2 | |
Assume Windows packaging doesn't include openssl
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/Packaging/nsis/swift.nsi | 8 | ||||
| -rw-r--r-- | Swift/QtUI/SConscript | 4 |
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 @@ -52,20 +52,20 @@ FunctionEnd # default section start section "Main install" # define output path 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" File "..\..\QtUI\Swift\QtWebKit4.dll" File "..\..\QtUI\Swift\QtNetwork4.dll" File "..\..\QtUI\Swift\QtXMLPatterns4.dll" SetOutPath $INSTDIR\imageformats @@ -133,20 +133,20 @@ sectionEnd # create a section to define what the uninstaller does. # the section will always be named "Uninstall" section "Uninstall" # Always delete uninstaller first delete $INSTDIR\uninstaller.exe # 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 delete $INSTDIR\QtWebKit4.dll delete $INSTDIR\QtNetwork4.dll delete $INSTDIR\QtXMLPatterns4.dll delete $INSTDIR\imageformats\qgif4.dll delete $INSTDIR\imageformats\qico4.dll delete $INSTDIR\imageformats\qjpeg4.dll diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript index 932a1fa..a62e14c 100644 --- a/Swift/QtUI/SConscript +++ b/Swift/QtUI/SConscript @@ -248,20 +248,20 @@ if env.get("SWIFT_INSTALLDIR", "") : for i in ["16", "22", "24", "64", "128"] : env.InstallAs(os.path.join(icons_path, i + "x" + i, "apps", "swift.png"), "#/Swift/resources/logo/logo-icon-" + i + ".png") env.Install(os.path.join(env["SWIFT_INSTALLDIR"], "share", "applications"), "#/Swift/resources/swift.desktop") for dir, resource in commonResources.items() : env.Install(os.path.join(env["SWIFT_INSTALLDIR"], "share", "swift", dir), resource) 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", resources = commonResources, qtimageformats = ["gif", "ico", "jpeg", "mng", "svg", "tiff"], qtlibs = ["QtCore4", "QtGui4", "QtNetwork4", "QtWebKit4", "QtXMLPatterns4", "phonon4"]) myenv.Append(NSIS_OPTIONS = [ "/DmsvccRedistributableDir=\"" + env["vcredist"] + "\"", |