2 files changed, 14 insertions, 16 deletions
diff --git a/Swift/Packaging/nsis/swift.nsi b/Swift/Packaging/nsis/swift.nsi
index 5492648..49bb934 100644
--- a/Swift/Packaging/nsis/swift.nsi
+++ b/Swift/Packaging/nsis/swift.nsi
@@ -1,8 +1,6 @@
 # set dependencies
-!define swiftBuildDir "..\..\QtUI\Swift"
 !define msvccRedistributableExe "vcredist_x86.exe"
 
-
 # define installer name
 outFile "Swift-installer-win32-${buildDate}.exe"
  
@@ -19,14 +17,14 @@ setOutPath $INSTDIR
  
 # Specify files to go in output path.
 # If you update this list, update the uninstall list too.
-file ${swiftBuildDir}\Swift.exe
-file ${swiftBuildDir}\ssleay32.dll
-file ${swiftBuildDir}\libeay32.dll
-file ${swiftBuildDir}\phonon4.dll
-file ${swiftBuildDir}\QtCore4.dll
-file ${swiftBuildDir}\QtGui4.dll
-file ${swiftBuildDir}\QtWebKit4.dll
-file ${swiftBuildDir}\QtNetwork4.dll
+File "..\..\QtUI\Swift\Swift.exe"
+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"
 
 # create start menu item
 createShortCut "$SMPROGRAMS\Swift\Swift.lnk" "$INSTDIR\Swift.exe"
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 72b9d6d..9b672b0 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -90,13 +90,13 @@ if env["PLATFORM"] == "darwin" :
     ])
 
 if env["PLATFORM"] == "win32" :
-	myenv.WindowsBundle("Swift", resources = [
-			os.path.join(env["OPENSSL_DIR"], "bin", "ssleay32.dll"),	
-			os.path.join(env["OPENSSL_DIR"], "bin", "libeay32.dll"),	
-			[os.path.join(env["QTDIR"], "plugins", "imageformats", "q" + codec + "4.dll") for codec in ["gif", "ico", "jpeg", "mng", "svg", "tiff"]]
-		], qtlibs = ["QtCore4", "QtGui4", "QtNetwork4", "QtWebKit4", "phonon4"])
-
 	if "dist" in COMMAND_LINE_TARGETS or env.GetOption("clean") :
+		myenv.WindowsBundle("Swift", resources = [
+				os.path.join(env["OPENSSL_DIR"], "bin", "ssleay32.dll"),	
+				os.path.join(env["OPENSSL_DIR"], "bin", "libeay32.dll"),	
+				[os.path.join(env["QTDIR"], "plugins", "imageformats", "q" + codec + "4.dll") for codec in ["gif", "ico", "jpeg", "mng", "svg", "tiff"]]
+			], qtlibs = ["QtCore4", "QtGui4", "QtNetwork4", "QtWebKit4", "phonon4"])
+
 		myenv.Append(NSIS_OPTIONS = [
 				"/DmsvccRedistributableDir=\"" + env["vcredist"] + "\"", 
 				"/DbuildDate=" + datetime.date.today().strftime("%Y%m%d")