diff --git a/libqethereum/QEthereum.cpp b/libqethereum/QEthereum.cpp
index e79ebd90e..3ad409a8f 100644
--- a/libqethereum/QEthereum.cpp
+++ b/libqethereum/QEthereum.cpp
@@ -394,19 +394,4 @@ void QEthereum::doTransact(QString _secret, QString _amount, QString _dest, QStr
#include\
"moc_QEthereum.cpp"
-// specify library dependencies, it's easier to do here than in the project since we can control the "d" debug suffix
-#ifdef _DEBUG
-#define QTLIB(x) x"d.lib"
-#else
-#define QTLIB(x) x".lib"
-#endif
-
-#pragma comment(lib, QTLIB("Qt5PlatformSupport"))
-#pragma comment(lib, QTLIB("Qt5Core"))
-#pragma comment(lib, QTLIB("Qt5GUI"))
-#pragma comment(lib, QTLIB("Qt5Network"))
-#pragma comment(lib, QTLIB("Qt5Webkit"))
-#pragma comment(lib, QTLIB("Qt5WebkitWidgets"))
-#pragma comment(lib, QTLIB("Qt5Widgets"))
-
#endif
diff --git a/walleth/MainWin.cpp b/walleth/MainWin.cpp
index 4df4bf0d1..a04b6a99f 100644
--- a/walleth/MainWin.cpp
+++ b/walleth/MainWin.cpp
@@ -300,14 +300,4 @@ void Main::on_create_triggered()
#include\
"qrc_Resources.cpp"
-// specify library dependencies, it's easier to do here than in the project since we can control the "d" debug suffix
-#ifdef _DEBUG
-#define QTLIB(x) x"d.lib"
-#else
-#define QTLIB(x) x".lib"
-#endif
-
-#pragma comment(lib, QTLIB("Qt5Quick"))
-#pragma comment(lib, QTLIB("Qt5Qml"))
-
#endif
diff --git a/windows/Alethzero.vcxproj b/windows/Alethzero.vcxproj
index c671079d0..b54e97b47 100644
--- a/windows/Alethzero.vcxproj
+++ b/windows/Alethzero.vcxproj
@@ -65,14 +65,12 @@
-
-
@@ -100,23 +98,8 @@
true
- xcopy /D ..\..\icu\bin_$(Platform)\icu*52.dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Core$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Gui$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Multimedia$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5MultimediaWidgets$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Network$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5OpenGL$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Positioning$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5PrintSupport$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Qml$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Quick$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Sensors$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Sql$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Webkit$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5WebkitWidgets$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir) > nul
-
+
+
@@ -133,23 +116,8 @@ xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir)
true
- xcopy /D ..\..\icu\bin_$(Platform)\icu*52.dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Core$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Gui$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Multimedia$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5MultimediaWidgets$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Network$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5OpenGL$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Positioning$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5PrintSupport$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Qml$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Quick$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Sensors$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Sql$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Webkit$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5WebkitWidgets$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir) > nul
-
+
+
@@ -172,23 +140,8 @@ xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir)
true
- xcopy /D ..\..\icu\bin_$(Platform)\icu*52.dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Core$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Gui$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Multimedia$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5MultimediaWidgets$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Network$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5OpenGL$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Positioning$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5PrintSupport$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Qml$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Quick$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Sensors$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Sql$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Webkit$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5WebkitWidgets$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir) > nul
-
+
+
@@ -210,23 +163,8 @@ xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir)
true
- xcopy /D ..\..\icu\bin_$(Platform)\icu*52.dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Core$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Gui$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Multimedia$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5MultimediaWidgets$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Network$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5OpenGL$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Positioning$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5PrintSupport$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Qml$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Quick$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Sensors$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Sql$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Webkit$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5WebkitWidgets$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir) > nul
-
+
+
@@ -311,4 +249,17 @@ xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir)
+
+
+
+
+
+
+ $(BuildDependsOn);FinalCopy
+
+
+
+
+
+
\ No newline at end of file
diff --git a/windows/CopyBinary.props b/windows/CopyBinary.props
deleted file mode 100644
index 838add31d..000000000
--- a/windows/CopyBinary.props
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
- xcopy /D /Y $(OutDir)$(TargetName)$(TargetExt) ..\..\_binaries\$(Platform)\ > nul
-xcopy /D $(OutDir)*.dll ..\..\_binaries\$(Platform)\ > nul
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/windows/Ethereum.vcxproj b/windows/Ethereum.vcxproj
index 024a1fbeb..905491b73 100644
--- a/windows/Ethereum.vcxproj
+++ b/windows/Ethereum.vcxproj
@@ -62,13 +62,11 @@
-
-
@@ -190,4 +188,13 @@
+
+ $(BuildDependsOn);FinalCopy
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/windows/LibEthereum_Debug.props b/windows/LibEthereum_Debug.props
index c5f6ebe52..6d322078a 100644
--- a/windows/LibEthereum_Debug.props
+++ b/windows/LibEthereum_Debug.props
@@ -3,6 +3,7 @@
d
+ d
@@ -10,5 +11,8 @@
$(DebugSuffix)
+
+ $(d)
+
\ No newline at end of file
diff --git a/windows/LibQEthereum.props b/windows/LibQEthereum.props
index 9158ec9f6..9e3ab29be 100644
--- a/windows/LibQEthereum.props
+++ b/windows/LibQEthereum.props
@@ -3,9 +3,11 @@
../../Qt/$(Platform)
- $(QtDir)/qtbase/bin
- $(QtDir)/qtbase/include;../../Qt/Src/qtbase/include;../../Qt/Src/qtdeclarative/include;../../Qt/Src/qtwebkit/include
- $(QtDir)/qtbase/lib;$(QtDir)/qtbase/plugins/platforms;../../icu/lib64
+ $(QtDir)/qtbase
+ $(QtBase)/bin
+ $(QtBase)/include;../../Qt/Src/qtbase/include;../../Qt/Src/qtdeclarative/include;../../Qt/Src/qtwebkit/include
+ $(QtBase)/lib;$(QtBase)/plugins/platforms;../../icu/lib64
+ ..\..\icu\bin_$(Platform)\icu*52.dll;$(QtBase)\lib\Qt5Core$(d).dll;$(QtBase)\lib\Qt5Gui$(d).dll;$(QtBase)\lib\Qt5Multimedia$(d).dll;$(QtBase)\lib\Qt5MultimediaWidgets$(d).dll;$(QtBase)\lib\Qt5OpenGL$(d).dll;$(QtBase)\lib\Qt5Positioning$(d).dll;$(QtBase)\lib\Qt5PrintSupport$(d).dll;$(QtBase)\lib\Qt5Network$(d).dll;$(QtBase)\lib\Qt5Qml$(d).dll;$(QtBase)\lib\Qt5Quick$(d).dll;$(QtBase)\lib\Qt5Sensors$(d).dll;$(QtBase)\lib\Qt5Sql$(d).dll;$(QtBase)\lib\Qt5Webkit$(d).dll;$(QtBase)\lib\Qt5WebkitWidgets$(d).dll;$(QtBase)\lib\Qt5Widgets$(d).dll;$(QtBase)\plugins\**\qwindows$(d).dll;$(QtBase)\plugins\**\qgenericbearer$(d).dll;$(QtBase)\plugins\**\qnativewifibearer$(d).dll;$(QtBase)\plugins\**\qgif$(d).dll;$(QtBase)\plugins\**\qico$(d).dll;$(QtBase)\plugins\**\qjpeg$(d).dll;$(QtBase)\plugins\**\qsvg$(d).dll;$(QtBase)\plugins\**\qtsensors_dummy$(d).dll
<_PropertySheetDisplayName>LibQEthereum
@@ -16,18 +18,24 @@
..;$(QtInclude);%(AdditionalIncludeDirectories)
4718;%(DisableSpecificWarnings)
-
- $(QtLib);%(AdditionalLibraryDirectories)
-
+
+
+
+ $(QtLib);%(AdditionalLibraryDirectories)
+ Qt5PlatformSupport$(d).lib;Qt5Core$(d).lib;Qt5GUI$(d).lib;Qt5Network$(d).lib;Qt5Quick$(d).lib;Qt5Qml$(d).lib;Qt5Webkit$(d).lib;Qt5WebkitWidgets$(d).lib;Qt5Widgets$(d).lib;%(AdditionalDependencies)
+
$(QtDir)
+
+ $(QtBase)
+
$(QtBin)
@@ -37,5 +45,25 @@
$(QtLib)
+
+ $(CopyDlls)
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/windows/Walleth.vcxproj b/windows/Walleth.vcxproj
index 251d1c277..ad76f0f01 100644
--- a/windows/Walleth.vcxproj
+++ b/windows/Walleth.vcxproj
@@ -65,14 +65,12 @@
-
-
@@ -106,14 +104,8 @@
- xcopy /D ..\..\icu\bin_$(Platform)\icu*52.dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Core$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Gui$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Network$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Qml$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Quick$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir) > nul
-
+
+
@@ -137,14 +129,8 @@ xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir)
- xcopy /D ..\..\icu\bin_$(Platform)\icu*52.dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Core$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Gui$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Network$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Qml$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Quick$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir) > nul
-
+
+
@@ -173,14 +159,8 @@ xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir)
- xcopy /D ..\..\icu\bin_$(Platform)\icu*52.dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Core$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Gui$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Network$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Qml$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Quick$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir) > nul
-
+
+
@@ -209,14 +189,8 @@ xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir)
- xcopy /D ..\..\icu\bin_$(Platform)\icu*52.dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Core$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Gui$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Network$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Qml$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Quick$(DebugSuffix).dll $(OutDir) > nul
-xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir) > nul
-
+
+
@@ -323,4 +297,19 @@ xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir)
+
+
+
+
+
+
+
+ $(BuildDependsOn);FinalCopy
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/windows/Walleth.vcxproj.filters b/windows/Walleth.vcxproj.filters
index ba43a3244..804248d9f 100644
--- a/windows/Walleth.vcxproj.filters
+++ b/windows/Walleth.vcxproj.filters
@@ -16,6 +16,7 @@
Windows
+
@@ -28,7 +29,6 @@
-
\ No newline at end of file