diff --git a/walleth/MainWin.cpp b/walleth/MainWin.cpp
index 6b36099e2..4df4bf0d1 100644
--- a/walleth/MainWin.cpp
+++ b/walleth/MainWin.cpp
@@ -296,6 +296,10 @@ void Main::on_create_triggered()
#include\
"moc_MainWin.cpp"
+// include qrc content
+#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"
diff --git a/windows/Ethereum.sln b/windows/Ethereum.sln
index b00610258..c87000e90 100644
--- a/windows/Ethereum.sln
+++ b/windows/Ethereum.sln
@@ -29,6 +29,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Walleth", "Walleth.vcxproj"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibQEthereum", "LibQEthereum.vcxproj", "{DF3C5B07-A1A2-4F16-B37F-A27333622CDD}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibEthCore", "LibEthCore.vcxproj", "{22DAD0B1-4EC6-425A-B75C-FE7F01FEE615}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -125,6 +127,14 @@ Global
{DF3C5B07-A1A2-4F16-B37F-A27333622CDD}.Release|Win32.Build.0 = Release|Win32
{DF3C5B07-A1A2-4F16-B37F-A27333622CDD}.Release|x64.ActiveCfg = Release|x64
{DF3C5B07-A1A2-4F16-B37F-A27333622CDD}.Release|x64.Build.0 = Release|x64
+ {22DAD0B1-4EC6-425A-B75C-FE7F01FEE615}.Debug|Win32.ActiveCfg = Debug|Win32
+ {22DAD0B1-4EC6-425A-B75C-FE7F01FEE615}.Debug|Win32.Build.0 = Debug|Win32
+ {22DAD0B1-4EC6-425A-B75C-FE7F01FEE615}.Debug|x64.ActiveCfg = Debug|x64
+ {22DAD0B1-4EC6-425A-B75C-FE7F01FEE615}.Debug|x64.Build.0 = Debug|x64
+ {22DAD0B1-4EC6-425A-B75C-FE7F01FEE615}.Release|Win32.ActiveCfg = Release|Win32
+ {22DAD0B1-4EC6-425A-B75C-FE7F01FEE615}.Release|Win32.Build.0 = Release|Win32
+ {22DAD0B1-4EC6-425A-B75C-FE7F01FEE615}.Release|x64.ActiveCfg = Release|x64
+ {22DAD0B1-4EC6-425A-B75C-FE7F01FEE615}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -136,6 +146,7 @@ Global
{1CC213A4-3482-4211-B47B-172E90DAC7DE} = {988F2383-FA1D-408B-BCF6-C0EE7AB0A560}
{1B1CA20E-39C3-4D9B-AC37-3783048E6672} = {988F2383-FA1D-408B-BCF6-C0EE7AB0A560}
{DF3C5B07-A1A2-4F16-B37F-A27333622CDD} = {988F2383-FA1D-408B-BCF6-C0EE7AB0A560}
+ {22DAD0B1-4EC6-425A-B75C-FE7F01FEE615} = {988F2383-FA1D-408B-BCF6-C0EE7AB0A560}
{3BF049F8-AF7E-4E1C-9627-3E94C887AF24} = {6838FA95-01BF-4FF7-914C-FC209B81406E}
{3F3E389B-88DE-41D5-A73B-4F6036E18B36} = {6838FA95-01BF-4FF7-914C-FC209B81406E}
EndGlobalSection
diff --git a/windows/LibEthCore.vcxproj b/windows/LibEthCore.vcxproj
new file mode 100644
index 000000000..197dec8e5
--- /dev/null
+++ b/windows/LibEthCore.vcxproj
@@ -0,0 +1,193 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ stdafx.h
+ Create
+ Create
+ Create
+ Create
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {1cc213a4-3482-4211-b47b-172e90dac7de}
+
+
+ {27014763-955d-486b-9ba7-69872192e6f4}
+
+
+ {1b1ca20e-39c3-4d9b-ac37-3783048e6672}
+
+
+ {1e1175bb-c4a9-41d8-b2d1-9022f71d3cea}
+
+
+
+ Win32Proj
+ LibEthCore
+ {22DAD0B1-4EC6-425A-B75C-FE7F01FEE615}
+
+
+
+ StaticLibrary
+ true
+ v120
+
+
+ StaticLibrary
+ true
+ v120
+
+
+ StaticLibrary
+ false
+ v120
+
+
+ StaticLibrary
+ false
+ v120
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Disabled
+ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
+ false
+ MultiThreadedDebugDLL
+ Use
+ stdafx.h
+
+
+ Windows
+ true
+
+
+
+
+ Disabled
+ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
+ false
+ MultiThreadedDebugDLL
+ stdafx.h
+ Use
+
+
+ Windows
+ true
+
+
+
+
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ true
+ MultiThreadedDLL
+ Use
+ stdafx.h
+
+
+ Windows
+ true
+ true
+ true
+
+
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ true
+ MultiThreadedDLL
+ Use
+ stdafx.h
+
+
+ Windows
+ true
+ true
+ true
+
+
+
+
+
+
\ No newline at end of file
diff --git a/windows/LibEthCore.vcxproj.filters b/windows/LibEthCore.vcxproj.filters
new file mode 100644
index 000000000..b961aae3f
--- /dev/null
+++ b/windows/LibEthCore.vcxproj.filters
@@ -0,0 +1,41 @@
+
+
+
+
+ Windows
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Windows
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {f864ef86-509c-4f25-b218-c4e7e604fdad}
+
+
+
\ No newline at end of file
diff --git a/windows/LibEthereum.props b/windows/LibEthereum.props
index 5b709e9c4..5bfb8da46 100644
--- a/windows/LibEthereum.props
+++ b/windows/LibEthereum.props
@@ -15,7 +15,7 @@
Level4
true
false
- include/$(ProjectName);$(IntDir);../libethereum;$(BoostDir);../../leveldb/include;../../cryptopp;../secp256k1;../../miniupnp
+ include/$(ProjectName);$(IntDir);..;../libethereum;$(BoostDir);../../leveldb/include;../../cryptopp;../secp256k1;../../miniupnp
ETH_BUILD_PLATFORM=Windows/VS2013;ETH_BUILD_TYPE=$(Configuration)-$(Platform);STATICLIB;LEVELDB_PLATFORM_WINDOWS;USE_NUM_BOOST;USE_FIELD_10X26;USE_FIELD_INV_BUILTIN;_WIN32_WINNT=0x0501;WIN32;%(PreprocessorDefinitions)
true
true
diff --git a/windows/LibEthereum.vcxproj b/windows/LibEthereum.vcxproj
index 1cafcdf07..8c8bbc2cc 100644
--- a/windows/LibEthereum.vcxproj
+++ b/windows/LibEthereum.vcxproj
@@ -23,37 +23,17 @@
-
- true
- true
- true
- true
-
-
-
-
-
- true
- true
- true
- true
-
-
-
-
-
-
stdafx.h
@@ -68,31 +48,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -100,6 +68,9 @@
{1cc213a4-3482-4211-b47b-172e90dac7de}
+
+ {22dad0b1-4ec6-425a-b75c-fe7f01fee615}
+
{27014763-955d-486b-9ba7-69872192e6f4}
diff --git a/windows/LibEthereum.vcxproj.filters b/windows/LibEthereum.vcxproj.filters
index ebda5b7ad..6cd7427bf 100644
--- a/windows/LibEthereum.vcxproj.filters
+++ b/windows/LibEthereum.vcxproj.filters
@@ -1,70 +1,48 @@
-
Windows
+
-
-
-
-
-
-
-
-
-
-
Windows
+
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/windows/Walleth.vcxproj b/windows/Walleth.vcxproj
index 3eed8091f..251d1c277 100644
--- a/windows/Walleth.vcxproj
+++ b/windows/Walleth.vcxproj
@@ -298,6 +298,28 @@ xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir)
{df3c5b07-a1a2-4f16-b37f-a27333622cdd}
+
+
+ Document
+ "$(QtBin)/rcc" -o "$(IntDir)qrc_%(FileName).cpp" "%(FullPath)"
+ "$(QtBin)/rcc" -o "$(IntDir)qrc_%(FileName).cpp" "%(FullPath)"
+ "$(QtBin)/rcc" -o "$(IntDir)qrc_%(FileName).cpp" "%(FullPath)"
+ "$(QtBin)/rcc" -o "$(IntDir)qrc_%(FileName).cpp" "%(FullPath)"
+ "$(QtBin)/rcc" -o "$(IntDir)qrc_%(FileName).cpp" "%(FullPath)"
+ "$(QtBin)/rcc" -o "$(IntDir)qrc_%(FileName).cpp" "%(FullPath)"
+ "$(QtBin)/rcc" -o "$(IntDir)qrc_%(FileName).cpp" "%(FullPath)"
+ "$(QtBin)/rcc" -o "$(IntDir)qrc_%(FileName).cpp" "%(FullPath)"
+ $(IntDir)qrc_%(FileName).cpp
+ $(IntDir)qrc_%(FileName).cpp
+ $(IntDir)qrc_%(FileName).cpp
+ $(IntDir)qrc_%(FileName).cpp
+ ../Walleth/Simple.qml
+ ../Walleth/Simple.qml
+ ../Walleth/Simple.qml
+ ../Walleth/Simple.qml
+
+
+
diff --git a/windows/Walleth.vcxproj.filters b/windows/Walleth.vcxproj.filters
index cc783ee27..ba43a3244 100644
--- a/windows/Walleth.vcxproj.filters
+++ b/windows/Walleth.vcxproj.filters
@@ -27,4 +27,8 @@
Windows
+
+
+
+
\ No newline at end of file