lukechilds
/
ethminer
mirror of https://github.com/lukechilds/ethminer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop

cl-refactor
Gav Wood 11 years ago
parent
0ba1b7842e 4bd3d00c5e
commit
ead4965ea0
19 changed files with 363 additions and 322 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      alethzero/MainWin.cpp
  2. 15
      alethzero/MiningView.cpp
  3. 2
      alethzero/MiningView.h
  4. 2
      libethereum/Client.cpp
  5. 2
      libethsupport/FixedHash.h
  6. 2
      libethsupport/MemoryDB.cpp
  7. 8
      libethsupport/TrieDB.h
  8. 2
      liblll/CodeFragment.h
  9. 4
      libqethereum/QEthereum.cpp
  10. 5
      lllc/main.cpp
  11. 26
      windows/Alethzero.vcxproj
  12. 5
      windows/Alethzero.vcxproj.filters
  13. 15
      windows/Ethereum.sln
  14. 193
      windows/LibEthCore.vcxproj
  15. 41
      windows/LibEthCore.vcxproj.filters
  16. 2
      windows/LibEthereum.props
  17. 71
      windows/LibEthereum.vcxproj
  18. 285
      windows/LibEthereum.vcxproj.filters
  19. 2
      windows/LibQEthereum.props

3
alethzero/MainWin.cpp
View File

@ -1266,4 +1266,7 @@ void Main::updateDebugger()
#include\ #include\
"moc_MainWin.cpp" "moc_MainWin.cpp"
#include\
"moc_MiningView.cpp"
#endif #endif

15
alethzero/MiningView.cpp
View File

@ -27,9 +27,20 @@
#include "Grapher.h" #include "Grapher.h"
using namespace std; using namespace std;
using namespace eth;
using namespace lb; using namespace lb;
// do *not* use eth since eth::uint conflicts with Qt's global unit definition
// using namespace eth;
// types
using eth::MineInfo;
using eth::MineProgress;
// functions
using eth::toString;
using eth::trimFront;
string id(float _y) { return toString(_y); } string id(float _y) { return toString(_y); }
string s(float _x){ return toString(round(_x * 1000) / 1000) + (!_x ? "s" : ""); } string s(float _x){ return toString(round(_x * 1000) / 1000) + (!_x ? "s" : ""); }
string sL(float _x, float _y) { return toString(round(_x * 1000)) + "s (" + toString(_y) + ")"; } string sL(float _x, float _y) { return toString(round(_x * 1000)) + "s (" + toString(_y) + ")"; }
@ -95,7 +106,7 @@ void MiningView::paintEvent(QPaintEvent*)
g.init(&p, make_pair(0.f, max<float>(m_duration * 0.1f, m_values.size() * 0.1f)), make_pair(0, 255.f - (m_progress.requirement - 4)), s, id, sL); g.init(&p, make_pair(0.f, max<float>(m_duration * 0.1f, m_values.size() * 0.1f)), make_pair(0, 255.f - (m_progress.requirement - 4)), s, id, sL);
g.drawAxes(); g.drawAxes();
g.setDataTransform(0.1, 0, -1, 255.f); g.setDataTransform(0.1f, 0, -1.0f, 255.f);
g.drawLineGraph(m_values, QColor(192, 192, 192)); g.drawLineGraph(m_values, QColor(192, 192, 192));
g.drawLineGraph(m_bests, QColor(128, 128, 128)); g.drawLineGraph(m_bests, QColor(128, 128, 128));

2
alethzero/MiningView.h
View File

@ -27,7 +27,7 @@
namespace eth namespace eth
{ {
class MineInfo; struct MineInfo;
} }
class MiningView: public QWidget class MiningView: public QWidget

2
libethereum/Client.cpp
View File

@ -224,7 +224,7 @@ void Client::work()
{ {
if (m_restartMining) if (m_restartMining)
{ {
m_mineProgress.best = (uint)-1; m_mineProgress.best = (double)-1;
m_mineProgress.hashes = 0; m_mineProgress.hashes = 0;
m_mineProgress.ms = 0; m_mineProgress.ms = 0;
lock_guard<recursive_mutex> l(m_lock); lock_guard<recursive_mutex> l(m_lock);

2
libethsupport/FixedHash.h
View File

@ -120,7 +120,7 @@ public:
{ {
FixedHash ret; FixedHash ret;
for (auto& i: ret.m_data) for (auto& i: ret.m_data)
i = std::uniform_int_distribution<byte>(0, 255)(_eng); i = std::uniform_int_distribution<uint16_t>(0, 255)(_eng);
return ret; return ret;
} }

2
libethsupport/MemoryDB.cpp
View File

@ -91,8 +91,8 @@ bool MemoryDB::kill(h256 _h)
return false; return false;
} }
#else #else
return true;
} }
return true;
#endif #endif
} }

8
libethsupport/TrieDB.h
View File

@ -200,7 +200,7 @@ private:
std::string atAux(RLP const& _here, NibbleSlice _key) const; std::string atAux(RLP const& _here, NibbleSlice _key) const;
void mergeAtAux(RLPStream& _out, RLP const& _replace, NibbleSlice _key, bytesConstRef _value); void mergeAtAux(RLPStream& _out, RLP const& _replace, NibbleSlice _key, bytesConstRef _value);
bytes mergeAt(RLP const& _replace, NibbleSlice _k, bytesConstRef _v, bool _inline = false); bytes mergeAt(RLP const& _replace, NibbleSlice _k, bytesConstRef _v, bool _inLine = false);
bool deleteAtAux(RLPStream& _out, RLP const& _replace, NibbleSlice _key); bool deleteAtAux(RLPStream& _out, RLP const& _replace, NibbleSlice _key);
bytes deleteAt(RLP const& _replace, NibbleSlice _k); bytes deleteAt(RLP const& _replace, NibbleSlice _k);
@ -502,7 +502,7 @@ template <class DB> std::string GenericTrieDB<DB>::atAux(RLP const& _here, Nibbl
} }
} }
template <class DB> bytes GenericTrieDB<DB>::mergeAt(RLP const& _orig, NibbleSlice _k, bytesConstRef _v, bool _inline) template <class DB> bytes GenericTrieDB<DB>::mergeAt(RLP const& _orig, NibbleSlice _k, bytesConstRef _v, bool _inLine)
{ {
#if ETH_PARANOIA #if ETH_PARANOIA
tdebug << "mergeAt " << _orig << _k << sha3(_orig.data()).abridged(); tdebug << "mergeAt " << _orig << _k << sha3(_orig.data()).abridged();
@ -529,7 +529,7 @@ template <class DB> bytes GenericTrieDB<DB>::mergeAt(RLP const& _orig, NibbleSli
// partial key is our key - move down. // partial key is our key - move down.
if (_k.contains(k) && !isLeaf(_orig)) if (_k.contains(k) && !isLeaf(_orig))
{ {
if (!_inline) if (!_inLine)
killNode(_orig); killNode(_orig);
RLPStream s(2); RLPStream s(2);
s.append(_orig[0]); s.append(_orig[0]);
@ -555,7 +555,7 @@ template <class DB> bytes GenericTrieDB<DB>::mergeAt(RLP const& _orig, NibbleSli
return place(_orig, _k, _v); return place(_orig, _k, _v);
// Kill the node. // Kill the node.
if (!_inline) if (!_inLine)
killNode(_orig); killNode(_orig);
// not exactly our node - delve to next level at the correct index. // not exactly our node - delve to next level at the correct index.

2
liblll/CodeFragment.h
View File

@ -32,7 +32,7 @@ namespace sp = boost::spirit;
namespace eth namespace eth
{ {
class CompilerState; struct CompilerState;
class CodeFragment class CodeFragment
{ {

4
libqethereum/QEthereum.cpp
View File

@ -397,7 +397,7 @@ QString QEthereum::doCreate(QString _secret, QString _amount, QString _init, QSt
client()->changed(); client()->changed();
auto ret = toQJS(client()->transact(toSecret(_secret), toU256(_amount), toBytes(_init), toU256(_gas), toU256(_gasPrice))); auto ret = toQJS(client()->transact(toSecret(_secret), toU256(_amount), toBytes(_init), toU256(_gas), toU256(_gasPrice)));
while (!client()->peekChanged()) while (!client()->peekChanged())
usleep(10000); this_thread::sleep_for(chrono::milliseconds(10));
return ret; return ret;
} }
@ -406,7 +406,7 @@ void QEthereum::doTransact(QString _secret, QString _amount, QString _dest, QStr
client()->changed(); client()->changed();
client()->transact(toSecret(_secret), toU256(_amount), toAddress(_dest), toBytes(_data), toU256(_gas), toU256(_gasPrice)); client()->transact(toSecret(_secret), toU256(_amount), toAddress(_dest), toBytes(_data), toU256(_gas), toU256(_gasPrice));
while (!client()->peekChanged()) while (!client()->peekChanged())
usleep(10000); this_thread::sleep_for(chrono::milliseconds(10));
} }
// extra bits needed to link on VS // extra bits needed to link on VS

5
lllc/main.cpp
View File

@ -98,7 +98,7 @@ int main(int argc, char** argv)
vector<string> errors; vector<string> errors;
if (src.empty()) if (src.empty())
cerr << "Empty file." << endl; errors.push_back("Empty file.");
else if (mode == Disassemble) else if (mode == Disassemble)
{ {
cout << disassemble(fromHex(src)) << endl; cout << disassemble(fromHex(src)) << endl;
@ -117,6 +117,7 @@ int main(int argc, char** argv)
cout << compileLLLToAsm(src, optimise ? true : false, &errors) << endl; cout << compileLLLToAsm(src, optimise ? true : false, &errors) << endl;
for (auto const& i: errors) for (auto const& i: errors)
cerr << i << endl; cerr << i << endl;
if ( errors.size() )
return 1;
return 0; return 0;
} }

26
windows/Alethzero.vcxproj
View File

@ -173,8 +173,10 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\alethzero\Grapher.cpp" />
<ClCompile Include="..\alethzero\main.cpp" /> <ClCompile Include="..\alethzero\main.cpp" />
<ClCompile Include="..\alethzero\MainWin.cpp" /> <ClCompile Include="..\alethzero\MainWin.cpp" />
<ClCompile Include="..\alethzero\MiningView.cpp" />
<ClCompile Include="stdafx.cpp"> <ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
@ -202,6 +204,26 @@
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)moc_%(FileName).cpp</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)moc_%(FileName).cpp</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)moc_%(FileName).cpp</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)moc_%(FileName).cpp</Outputs>
</CustomBuild> </CustomBuild>
<ClInclude Include="..\alethzero\Grapher.h" />
<ClInclude Include="..\alethzero\GraphParameters.h" />
<CustomBuild Include="..\alethzero\MiningView.h">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Lua) moc.lua "$(QtBin)/moc" "$(IntDir)moc_%(FileName).cpp" "@(ClCompile->'%(AdditionalIncludeDirectories)');$(IncludePath)" "@(ClCompile->'%(PreprocessorDefinitions)');_MSC_VER=1800" "%(FullPath)"</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Lua) moc.lua "$(QtBin)/moc" "$(IntDir)moc_%(FileName).cpp" "@(ClCompile->'%(AdditionalIncludeDirectories)');$(IncludePath)" "@(ClCompile->'%(PreprocessorDefinitions)');_MSC_VER=1800" "%(FullPath)"</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Lua) moc.lua "$(QtBin)/moc" "$(IntDir)moc_%(FileName).cpp" "@(ClCompile->'%(AdditionalIncludeDirectories)');$(IncludePath)" "@(ClCompile->'%(PreprocessorDefinitions)');_MSC_VER=1800" "%(FullPath)"</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Lua) moc.lua "$(QtBin)/moc" "$(IntDir)moc_%(FileName).cpp" "@(ClCompile->'%(AdditionalIncludeDirectories)');$(IncludePath)" "@(ClCompile->'%(PreprocessorDefinitions)');_MSC_VER=1800" "%(FullPath)"</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)moc_%(FileName).cpp</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)moc_%(FileName).cpp</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)moc_%(FileName).cpp</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)moc_%(FileName).cpp</Outputs>
</CustomBuild>
<ClInclude Include="stdafx.h" /> <ClInclude Include="stdafx.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -255,7 +277,9 @@
</ItemGroup> </ItemGroup>
<Copy SourceFiles="@(CopyToOutDir)" DestinationFolder="$(OutDir)\%(RecursiveDir)" /> <Copy SourceFiles="@(CopyToOutDir)" DestinationFolder="$(OutDir)\%(RecursiveDir)" />
</Target> </Target>
<PropertyGroup><BuildDependsOn>$(BuildDependsOn);FinalCopy</BuildDependsOn></PropertyGroup> <PropertyGroup>
<BuildDependsOn>$(BuildDependsOn);FinalCopy</BuildDependsOn>
</PropertyGroup>
<Target Name="FinalCopy" DependsOnTargets="AfterBuild" Condition="'$(Configuration)' == 'Release'"> <Target Name="FinalCopy" DependsOnTargets="AfterBuild" Condition="'$(Configuration)' == 'Release'">
<ItemGroup> <ItemGroup>
<CopyToBinDir Include="$(OutDir)\**\*.dll;$(OutDir)\*.exe" /> <CopyToBinDir Include="$(OutDir)\**\*.dll;$(OutDir)\*.exe" />

5
windows/Alethzero.vcxproj.filters
View File

@ -9,11 +9,16 @@
<ClCompile Include="WinMain.cpp"> <ClCompile Include="WinMain.cpp">
<Filter>Windows</Filter> <Filter>Windows</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\alethzero\Grapher.cpp" />
<ClCompile Include="..\alethzero\MiningView.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="stdafx.h"> <ClInclude Include="stdafx.h">
<Filter>Windows</Filter> <Filter>Windows</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\alethzero\Grapher.h" />
<ClInclude Include="..\alethzero\GraphParameters.h" />
<ClInclude Include="..\alethzero\MiningView.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="Windows"> <Filter Include="Windows">

15
windows/Ethereum.sln
View File

@ -27,11 +27,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Walleth", "Walleth.vcxproj"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibQEthereum", "LibQEthereum.vcxproj", "{DF3C5B07-A1A2-4F16-B37F-A27333622CDD}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibQEthereum", "LibQEthereum.vcxproj", "{DF3C5B07-A1A2-4F16-B37F-A27333622CDD}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibEthCore", "LibEthCore.vcxproj", "{22DAD0B1-4EC6-425A-B75C-FE7F01FEE615}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eth", "Eth.vcxproj", "{C60C065C-2135-4B2B-AFD4-35FD7AC56B40}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Eth", "Eth.vcxproj", "{C60C065C-2135-4B2B-AFD4-35FD7AC56B40}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "neth", "Neth.vcxproj", "{90C70663-7181-4E99-9079-54188CEB8954}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Neth", "Neth.vcxproj", "{90C70663-7181-4E99-9079-54188CEB8954}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -121,14 +119,6 @@ Global
{DF3C5B07-A1A2-4F16-B37F-A27333622CDD}.Release|Win32.Build.0 = Release|Win32 {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.ActiveCfg = Release|x64
{DF3C5B07-A1A2-4F16-B37F-A27333622CDD}.Release|x64.Build.0 = 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
{C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Debug|Win32.ActiveCfg = Debug|Win32 {C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Debug|Win32.ActiveCfg = Debug|Win32
{C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Debug|Win32.Build.0 = Debug|Win32 {C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Debug|Win32.Build.0 = Debug|Win32
{C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Debug|x64.ActiveCfg = Debug|x64 {C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Debug|x64.ActiveCfg = Debug|x64
@ -156,7 +146,6 @@ Global
{1CC213A4-3482-4211-B47B-172E90DAC7DE} = {988F2383-FA1D-408B-BCF6-C0EE7AB0A560} {1CC213A4-3482-4211-B47B-172E90DAC7DE} = {988F2383-FA1D-408B-BCF6-C0EE7AB0A560}
{1B1CA20E-39C3-4D9B-AC37-3783048E6672} = {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} {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} {3BF049F8-AF7E-4E1C-9627-3E94C887AF24} = {6838FA95-01BF-4FF7-914C-FC209B81406E}
{3F3E389B-88DE-41D5-A73B-4F6036E18B36} = {6838FA95-01BF-4FF7-914C-FC209B81406E} {3F3E389B-88DE-41D5-A73B-4F6036E18B36} = {6838FA95-01BF-4FF7-914C-FC209B81406E}
EndGlobalSection EndGlobalSection

193
windows/LibEthCore.vcxproj
View File

@ -1,193 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\libethcore\Common.cpp" />
<ClCompile Include="..\libethcore\CommonData.cpp" />
<ClCompile Include="..\libethcore\CommonIO.cpp" />
<ClCompile Include="..\libethcore\FileSystem.cpp" />
<ClCompile Include="..\libethcore\FixedHash.cpp" />
<ClCompile Include="..\libethcore\Log.cpp" />
<ClCompile Include="..\libethcore\RLP.cpp" />
<ClCompile Include="..\libethcore\TrieCommon.cpp" />
<ClCompile Include="..\libethcore\TrieDB.cpp" />
<ClCompile Include="..\libethcore\UPnP.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">stdafx.h</PrecompiledHeaderFile>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\libethcore\Common.h" />
<ClInclude Include="..\libethcore\CommonData.h" />
<ClInclude Include="..\libethcore\CommonIO.h" />
<ClInclude Include="..\libethcore\CryptoHeaders.h" />
<ClInclude Include="..\libethcore\Exceptions.h" />
<ClInclude Include="..\libethcore\FileSystem.h" />
<ClInclude Include="..\libethcore\FixedHash.h" />
<ClInclude Include="..\libethcore\Log.h" />
<ClInclude Include="..\libethcore\RLP.h" />
<ClInclude Include="..\libethcore\TrieCommon.h" />
<ClInclude Include="..\libethcore\TrieDB.h" />
<ClInclude Include="..\libethcore\UPnP.h" />
<ClInclude Include="..\libethcore\vector_ref.h" />
<ClInclude Include="stdafx.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="LibCryptoPP.vcxproj">
<Project>{1cc213a4-3482-4211-b47b-172e90dac7de}</Project>
</ProjectReference>
<ProjectReference Include="LibLevelDB.vcxproj">
<Project>{27014763-955d-486b-9ba7-69872192e6f4}</Project>
</ProjectReference>
<ProjectReference Include="LibMiniUPnPc.vcxproj">
<Project>{1b1ca20e-39c3-4d9b-ac37-3783048e6672}</Project>
</ProjectReference>
<ProjectReference Include="LibSecp256k1.vcxproj">
<Project>{1e1175bb-c4a9-41d8-b2d1-9022f71d3cea}</Project>
</ProjectReference>
</ItemGroup>
<PropertyGroup Label="Globals">
<Keyword>Win32Proj</Keyword>
<RootNamespace>LibEthCore</RootNamespace>
<ProjectGuid>{22DAD0B1-4EC6-425A-B75C-FE7F01FEE615}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="LibEthereum.props" />
<Import Project="LibEthereum_Debug.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="LibEthereum.props" />
<Import Project="LibEthereum_Debug.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="LibEthereum.props" />
<Import Project="LibEthereum_Release.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="LibEthereum.props" />
<Import Project="LibEthereum_Release.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
<PrecompiledHeader>Use</PrecompiledHeader>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<Lib />
<ProjectReference />
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<TreatWarningAsError>true</TreatWarningAsError>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<TreatWarningAsError>true</TreatWarningAsError>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

41
windows/LibEthCore.vcxproj.filters
View File

@ -1,41 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="stdafx.cpp">
<Filter>Windows</Filter>
</ClCompile>
<ClCompile Include="..\libethcore\Common.cpp" />
<ClCompile Include="..\libethcore\CommonData.cpp" />
<ClCompile Include="..\libethcore\CommonIO.cpp" />
<ClCompile Include="..\libethcore\FileSystem.cpp" />
<ClCompile Include="..\libethcore\FixedHash.cpp" />
<ClCompile Include="..\libethcore\Log.cpp" />
<ClCompile Include="..\libethcore\RLP.cpp" />
<ClCompile Include="..\libethcore\TrieCommon.cpp" />
<ClCompile Include="..\libethcore\TrieDB.cpp" />
<ClCompile Include="..\libethcore\UPnP.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="stdafx.h">
<Filter>Windows</Filter>
</ClInclude>
<ClInclude Include="..\libethcore\Common.h" />
<ClInclude Include="..\libethcore\CommonData.h" />
<ClInclude Include="..\libethcore\CommonIO.h" />
<ClInclude Include="..\libethcore\CryptoHeaders.h" />
<ClInclude Include="..\libethcore\Exceptions.h" />
<ClInclude Include="..\libethcore\FileSystem.h" />
<ClInclude Include="..\libethcore\FixedHash.h" />
<ClInclude Include="..\libethcore\Log.h" />
<ClInclude Include="..\libethcore\RLP.h" />
<ClInclude Include="..\libethcore\TrieCommon.h" />
<ClInclude Include="..\libethcore\TrieDB.h" />
<ClInclude Include="..\libethcore\UPnP.h" />
<ClInclude Include="..\libethcore\vector_ref.h" />
</ItemGroup>
<ItemGroup>
<Filter Include="Windows">
<UniqueIdentifier>{f864ef86-509c-4f25-b218-c4e7e604fdad}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>

2
windows/LibEthereum.props
View File

@ -15,7 +15,7 @@
<WarningLevel>Level4</WarningLevel> <WarningLevel>Level4</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<AdditionalIncludeDirectories>include/$(ProjectName);$(IntDir);..;../libethereum;$(BoostDir);../../leveldb/include;../../cryptopp;../secp256k1;../../miniupnp</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>include/$(ProjectName);$(IntDir);..;../libethcore;../libethereum;../libethsupport;$(BoostDir);../../leveldb/include;../../cryptopp;../secp256k1;../../miniupnp</AdditionalIncludeDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions> <PreprocessorDefinitions>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)</PreprocessorDefinitions>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>

71
windows/LibEthereum.vcxproj
View File

@ -19,25 +19,42 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\libethcore\BlockInfo.cpp" />
<ClCompile Include="..\libethcore\CommonEth.cpp" />
<ClCompile Include="..\libethcore\Dagger.cpp" />
<ClCompile Include="..\libethcore\Instruction.cpp" />
<ClCompile Include="..\libethereum\AddressState.cpp" /> <ClCompile Include="..\libethereum\AddressState.cpp" />
<ClCompile Include="..\libethereum\BlockChain.cpp" /> <ClCompile Include="..\libethereum\BlockChain.cpp" />
<ClCompile Include="..\libethereum\BlockInfo.cpp" />
<ClCompile Include="..\libethereum\Client.cpp" /> <ClCompile Include="..\libethereum\Client.cpp" />
<ClCompile Include="..\libethereum\CommonEth.cpp" />
<ClCompile Include="..\libethereum\Dagger.cpp" />
<ClCompile Include="..\libethereum\Defaults.cpp" /> <ClCompile Include="..\libethereum\Defaults.cpp" />
<ClCompile Include="..\libethereum\Executive.cpp" /> <ClCompile Include="..\libethereum\Executive.cpp" />
<ClCompile Include="..\libethereum\ExtVM.cpp" /> <ClCompile Include="..\libethereum\ExtVM.cpp" />
<ClCompile Include="..\libethereum\ExtVMFace.cpp" />
<ClCompile Include="..\libethereum\FeeStructure.cpp" />
<ClCompile Include="..\libethereum\Instruction.cpp" />
<ClCompile Include="..\libethereum\PeerNetwork.cpp" /> <ClCompile Include="..\libethereum\PeerNetwork.cpp" />
<ClCompile Include="..\libethereum\PeerServer.cpp" /> <ClCompile Include="..\libethereum\PeerServer.cpp" />
<ClCompile Include="..\libethereum\PeerSession.cpp" /> <ClCompile Include="..\libethereum\PeerSession.cpp" />
<ClCompile Include="..\libethereum\State.cpp" /> <ClCompile Include="..\libethereum\State.cpp" />
<ClCompile Include="..\libethereum\Transaction.cpp" /> <ClCompile Include="..\libethereum\Transaction.cpp" />
<ClCompile Include="..\libethereum\TransactionQueue.cpp" /> <ClCompile Include="..\libethereum\TransactionQueue.cpp" />
<ClCompile Include="..\libethereum\VM.cpp" /> <ClCompile Include="..\libethsupport\Common.cpp" />
<ClCompile Include="..\libethsupport\CommonData.cpp" />
<ClCompile Include="..\libethsupport\CommonIO.cpp" />
<ClCompile Include="..\libethsupport\FileSystem.cpp" />
<ClCompile Include="..\libethsupport\FixedHash.cpp" />
<ClCompile Include="..\libethsupport\Log.cpp" />
<ClCompile Include="..\libethsupport\MemoryDB.cpp" />
<ClCompile Include="..\libethsupport\OverlayDB.cpp" />
<ClCompile Include="..\libethsupport\RLP.cpp" />
<ClCompile Include="..\libethsupport\TrieCommon.cpp" />
<ClCompile Include="..\libethsupport\TrieDB.cpp" />
<ClCompile Include="..\libethsupport\UPnP.cpp" />
<ClCompile Include="..\libevm\ExtVMFace.cpp" />
<ClCompile Include="..\libevm\FeeStructure.cpp" />
<ClCompile Include="..\libevm\VM.cpp" />
<ClCompile Include="..\liblll\Assembly.cpp" />
<ClCompile Include="..\liblll\CodeFragment.cpp" />
<ClCompile Include="..\liblll\Compiler.cpp" />
<ClCompile Include="..\liblll\CompilerState.cpp" />
<ClCompile Include="..\liblll\Parser.cpp" />
<ClCompile Include="stdafx.cpp"> <ClCompile Include="stdafx.cpp">
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">stdafx.h</PrecompiledHeaderFile> <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">stdafx.h</PrecompiledHeaderFile>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
@ -47,35 +64,53 @@
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\libethcore\BlockInfo.h" />
<ClInclude Include="..\libethcore\CommonEth.h" />
<ClInclude Include="..\libethcore\Dagger.h" />
<ClInclude Include="..\libethcore\Exceptions.h" />
<ClInclude Include="..\libethcore\Instruction.h" />
<ClInclude Include="..\libethereum\AddressState.h" /> <ClInclude Include="..\libethereum\AddressState.h" />
<ClInclude Include="..\libethereum\BlockChain.h" /> <ClInclude Include="..\libethereum\BlockChain.h" />
<ClInclude Include="..\libethereum\BlockInfo.h" />
<ClInclude Include="..\libethereum\Client.h" /> <ClInclude Include="..\libethereum\Client.h" />
<ClInclude Include="..\libethereum\CommonEth.h" />
<ClInclude Include="..\libethereum\Dagger.h" />
<ClInclude Include="..\libethereum\Defaults.h" /> <ClInclude Include="..\libethereum\Defaults.h" />
<ClInclude Include="..\libethereum\Exceptions.h" />
<ClInclude Include="..\libethereum\Executive.h" /> <ClInclude Include="..\libethereum\Executive.h" />
<ClInclude Include="..\libethereum\ExtVM.h" /> <ClInclude Include="..\libethereum\ExtVM.h" />
<ClInclude Include="..\libethereum\ExtVMFace.h" />
<ClInclude Include="..\libethereum\FeeStructure.h" />
<ClInclude Include="..\libethereum\Instruction.h" />
<ClInclude Include="..\libethereum\PeerNetwork.h" /> <ClInclude Include="..\libethereum\PeerNetwork.h" />
<ClInclude Include="..\libethereum\PeerServer.h" /> <ClInclude Include="..\libethereum\PeerServer.h" />
<ClInclude Include="..\libethereum\PeerSession.h" /> <ClInclude Include="..\libethereum\PeerSession.h" />
<ClInclude Include="..\libethereum\State.h" /> <ClInclude Include="..\libethereum\State.h" />
<ClInclude Include="..\libethereum\Transaction.h" /> <ClInclude Include="..\libethereum\Transaction.h" />
<ClInclude Include="..\libethereum\TransactionQueue.h" /> <ClInclude Include="..\libethereum\TransactionQueue.h" />
<ClInclude Include="..\libethereum\VM.h" /> <ClInclude Include="..\libethsupport\Common.h" />
<ClInclude Include="..\libethsupport\CommonData.h" />
<ClInclude Include="..\libethsupport\CommonIO.h" />
<ClInclude Include="..\libethsupport\CryptoHeaders.h" />
<ClInclude Include="..\libethsupport\Exceptions.h" />
<ClInclude Include="..\libethsupport\FileSystem.h" />
<ClInclude Include="..\libethsupport\FixedHash.h" />
<ClInclude Include="..\libethsupport\Log.h" />
<ClInclude Include="..\libethsupport\MemoryDB.h" />
<ClInclude Include="..\libethsupport\OverlayDB.h" />
<ClInclude Include="..\libethsupport\RLP.h" />
<ClInclude Include="..\libethsupport\TrieCommon.h" />
<ClInclude Include="..\libethsupport\TrieDB.h" />
<ClInclude Include="..\libethsupport\UPnP.h" />
<ClInclude Include="..\libethsupport\vector_ref.h" />
<ClInclude Include="..\libevm\ExtVMFace.h" />
<ClInclude Include="..\libevm\FeeStructure.h" />
<ClInclude Include="..\libevm\VM.h" />
<ClInclude Include="..\liblll\Assembly.h" />
<ClInclude Include="..\liblll\CodeFragment.h" />
<ClInclude Include="..\liblll\Compiler.h" />
<ClInclude Include="..\liblll\CompilerState.h" />
<ClInclude Include="..\liblll\Exceptions.h" />
<ClInclude Include="..\liblll\Parser.h" />
<ClInclude Include="stdafx.h" /> <ClInclude Include="stdafx.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="LibCryptoPP.vcxproj"> <ProjectReference Include="LibCryptoPP.vcxproj">
<Project>{1cc213a4-3482-4211-b47b-172e90dac7de}</Project> <Project>{1cc213a4-3482-4211-b47b-172e90dac7de}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="LibEthCore.vcxproj">
<Project>{22dad0b1-4ec6-425a-b75c-fe7f01fee615}</Project>
</ProjectReference>
<ProjectReference Include="LibLevelDB.vcxproj"> <ProjectReference Include="LibLevelDB.vcxproj">
<Project>{27014763-955d-486b-9ba7-69872192e6f4}</Project> <Project>{27014763-955d-486b-9ba7-69872192e6f4}</Project>
</ProjectReference> </ProjectReference>

285
windows/LibEthereum.vcxproj.filters
View File

@ -4,54 +4,261 @@
<ClCompile Include="stdafx.cpp"> <ClCompile Include="stdafx.cpp">
<Filter>Windows</Filter> <Filter>Windows</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\libethereum\AddressState.cpp" /> <ClCompile Include="..\libethereum\AddressState.cpp">
<ClCompile Include="..\libethereum\BlockChain.cpp" /> <Filter>libethereum</Filter>
<ClCompile Include="..\libethereum\BlockInfo.cpp" /> </ClCompile>
<ClCompile Include="..\libethereum\Client.cpp" /> <ClCompile Include="..\libethereum\BlockChain.cpp">
<ClCompile Include="..\libethereum\CommonEth.cpp" /> <Filter>libethereum</Filter>
<ClCompile Include="..\libethereum\Dagger.cpp" /> </ClCompile>
<ClCompile Include="..\libethereum\Defaults.cpp" /> <ClCompile Include="..\libethereum\Client.cpp">
<ClCompile Include="..\libethereum\FeeStructure.cpp" /> <Filter>libethereum</Filter>
<ClCompile Include="..\libethereum\Instruction.cpp" /> </ClCompile>
<ClCompile Include="..\libethereum\PeerNetwork.cpp" /> <ClCompile Include="..\libethereum\Defaults.cpp">
<ClCompile Include="..\libethereum\PeerServer.cpp" /> <Filter>libethereum</Filter>
<ClCompile Include="..\libethereum\PeerSession.cpp" /> </ClCompile>
<ClCompile Include="..\libethereum\State.cpp" /> <ClCompile Include="..\libethereum\Executive.cpp">
<ClCompile Include="..\libethereum\Transaction.cpp" /> <Filter>libethereum</Filter>
<ClCompile Include="..\libethereum\TransactionQueue.cpp" /> </ClCompile>
<ClCompile Include="..\libethereum\VM.cpp" /> <ClCompile Include="..\libethereum\ExtVM.cpp">
<ClCompile Include="..\libethereum\Executive.cpp" /> <Filter>libethereum</Filter>
<ClCompile Include="..\libethereum\ExtVM.cpp" /> </ClCompile>
<ClCompile Include="..\libethereum\ExtVMFace.cpp" /> <ClCompile Include="..\libethereum\PeerNetwork.cpp">
<Filter>libethereum</Filter>
</ClCompile>
<ClCompile Include="..\libethereum\PeerServer.cpp">
<Filter>libethereum</Filter>
</ClCompile>
<ClCompile Include="..\libethereum\PeerSession.cpp">
<Filter>libethereum</Filter>
</ClCompile>
<ClCompile Include="..\libethereum\State.cpp">
<Filter>libethereum</Filter>
</ClCompile>
<ClCompile Include="..\libethereum\Transaction.cpp">
<Filter>libethereum</Filter>
</ClCompile>
<ClCompile Include="..\libethereum\TransactionQueue.cpp">
<Filter>libethereum</Filter>
</ClCompile>
<ClCompile Include="..\libethcore\BlockInfo.cpp">
<Filter>libethcore</Filter>
</ClCompile>
<ClCompile Include="..\libethcore\CommonEth.cpp">
<Filter>libethcore</Filter>
</ClCompile>
<ClCompile Include="..\libethcore\Dagger.cpp">
<Filter>libethcore</Filter>
</ClCompile>
<ClCompile Include="..\libethcore\Instruction.cpp">
<Filter>libethcore</Filter>
</ClCompile>
<ClCompile Include="..\libethsupport\Common.cpp">
<Filter>libethsupport</Filter>
</ClCompile>
<ClCompile Include="..\libethsupport\CommonData.cpp">
<Filter>libethsupport</Filter>
</ClCompile>
<ClCompile Include="..\libethsupport\CommonIO.cpp">
<Filter>libethsupport</Filter>
</ClCompile>
<ClCompile Include="..\libethsupport\FileSystem.cpp">
<Filter>libethsupport</Filter>
</ClCompile>
<ClCompile Include="..\libethsupport\FixedHash.cpp">
<Filter>libethsupport</Filter>
</ClCompile>
<ClCompile Include="..\libethsupport\Log.cpp">
<Filter>libethsupport</Filter>
</ClCompile>
<ClCompile Include="..\libethsupport\MemoryDB.cpp">
<Filter>libethsupport</Filter>
</ClCompile>
<ClCompile Include="..\libethsupport\OverlayDB.cpp">
<Filter>libethsupport</Filter>
</ClCompile>
<ClCompile Include="..\libethsupport\RLP.cpp">
<Filter>libethsupport</Filter>
</ClCompile>
<ClCompile Include="..\libethsupport\TrieCommon.cpp">
<Filter>libethsupport</Filter>
</ClCompile>
<ClCompile Include="..\libethsupport\TrieDB.cpp">
<Filter>libethsupport</Filter>
</ClCompile>
<ClCompile Include="..\libethsupport\UPnP.cpp">
<Filter>libethsupport</Filter>
</ClCompile>
<ClCompile Include="..\liblll\Assembly.cpp">
<Filter>liblll</Filter>
</ClCompile>
<ClCompile Include="..\liblll\CodeFragment.cpp">
<Filter>liblll</Filter>
</ClCompile>
<ClCompile Include="..\liblll\Compiler.cpp">
<Filter>liblll</Filter>
</ClCompile>
<ClCompile Include="..\liblll\CompilerState.cpp">
<Filter>liblll</Filter>
</ClCompile>
<ClCompile Include="..\liblll\Parser.cpp">
<Filter>liblll</Filter>
</ClCompile>
<ClCompile Include="..\libevm\ExtVMFace.cpp">
<Filter>libevm</Filter>
</ClCompile>
<ClCompile Include="..\libevm\FeeStructure.cpp">
<Filter>libevm</Filter>
</ClCompile>
<ClCompile Include="..\libevm\VM.cpp">
<Filter>libevm</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="stdafx.h"> <ClInclude Include="stdafx.h">
<Filter>Windows</Filter> <Filter>Windows</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\libethereum\AddressState.h" /> <ClInclude Include="..\libethereum\AddressState.h">
<ClInclude Include="..\libethereum\BlockChain.h" /> <Filter>libethereum</Filter>
<ClInclude Include="..\libethereum\BlockInfo.h" /> </ClInclude>
<ClInclude Include="..\libethereum\Client.h" /> <ClInclude Include="..\libethereum\BlockChain.h">
<ClInclude Include="..\libethereum\CommonEth.h" /> <Filter>libethereum</Filter>
<ClInclude Include="..\libethereum\Dagger.h" /> </ClInclude>
<ClInclude Include="..\libethereum\Defaults.h" /> <ClInclude Include="..\libethereum\Client.h">
<ClInclude Include="..\libethereum\Exceptions.h" /> <Filter>libethereum</Filter>
<ClInclude Include="..\libethereum\ExtVMFace.h" /> </ClInclude>
<ClInclude Include="..\libethereum\FeeStructure.h" /> <ClInclude Include="..\libethereum\Defaults.h">
<ClInclude Include="..\libethereum\Instruction.h" /> <Filter>libethereum</Filter>
<ClInclude Include="..\libethereum\PeerNetwork.h" /> </ClInclude>
<ClInclude Include="..\libethereum\PeerServer.h" /> <ClInclude Include="..\libethereum\Executive.h">
<ClInclude Include="..\libethereum\PeerSession.h" /> <Filter>libethereum</Filter>
<ClInclude Include="..\libethereum\State.h" /> </ClInclude>
<ClInclude Include="..\libethereum\Transaction.h" /> <ClInclude Include="..\libethereum\ExtVM.h">
<ClInclude Include="..\libethereum\TransactionQueue.h" /> <Filter>libethereum</Filter>
<ClInclude Include="..\libethereum\VM.h" /> </ClInclude>
<ClInclude Include="..\libethereum\Executive.h" /> <ClInclude Include="..\libethereum\PeerNetwork.h">
<ClInclude Include="..\libethereum\ExtVM.h" /> <Filter>libethereum</Filter>
</ClInclude>
<ClInclude Include="..\libethereum\PeerServer.h">
<Filter>libethereum</Filter>
</ClInclude>
<ClInclude Include="..\libethereum\PeerSession.h">
<Filter>libethereum</Filter>
</ClInclude>
<ClInclude Include="..\libethereum\State.h">
<Filter>libethereum</Filter>
</ClInclude>
<ClInclude Include="..\libethereum\Transaction.h">
<Filter>libethereum</Filter>
</ClInclude>
<ClInclude Include="..\libethereum\TransactionQueue.h">
<Filter>libethereum</Filter>
</ClInclude>
<ClInclude Include="..\libethcore\BlockInfo.h">
<Filter>libethcore</Filter>
</ClInclude>
<ClInclude Include="..\libethcore\CommonEth.h">
<Filter>libethcore</Filter>
</ClInclude>
<ClInclude Include="..\libethcore\Dagger.h">
<Filter>libethcore</Filter>
</ClInclude>
<ClInclude Include="..\libethcore\Exceptions.h">
<Filter>libethcore</Filter>
</ClInclude>
<ClInclude Include="..\libethcore\Instruction.h">
<Filter>libethcore</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\Common.h">
<Filter>libethsupport</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\CommonData.h">
<Filter>libethsupport</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\CommonIO.h">
<Filter>libethsupport</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\CryptoHeaders.h">
<Filter>libethsupport</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\Exceptions.h">
<Filter>libethsupport</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\FileSystem.h">
<Filter>libethsupport</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\FixedHash.h">
<Filter>libethsupport</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\Log.h">
<Filter>libethsupport</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\MemoryDB.h">
<Filter>libethsupport</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\OverlayDB.h">
<Filter>libethsupport</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\RLP.h">
<Filter>libethsupport</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\TrieCommon.h">
<Filter>libethsupport</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\TrieDB.h">
<Filter>libethsupport</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\UPnP.h">
<Filter>libethsupport</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\vector_ref.h">
<Filter>libethsupport</Filter>
</ClInclude>
<ClInclude Include="..\liblll\Assembly.h">
<Filter>liblll</Filter>
</ClInclude>
<ClInclude Include="..\liblll\CodeFragment.h">
<Filter>liblll</Filter>
</ClInclude>
<ClInclude Include="..\liblll\Compiler.h">
<Filter>liblll</Filter>
</ClInclude>
<ClInclude Include="..\liblll\CompilerState.h">
<Filter>liblll</Filter>
</ClInclude>
<ClInclude Include="..\liblll\Exceptions.h">
<Filter>liblll</Filter>
</ClInclude>
<ClInclude Include="..\liblll\Parser.h">
<Filter>liblll</Filter>
</ClInclude>
<ClInclude Include="..\libevm\ExtVMFace.h">
<Filter>libevm</Filter>
</ClInclude>
<ClInclude Include="..\libevm\FeeStructure.h">
<Filter>libevm</Filter>
</ClInclude>
<ClInclude Include="..\libevm\VM.h">
<Filter>libevm</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="Windows"> <Filter Include="Windows">
<UniqueIdentifier>{2d571d8f-bacf-4c49-a0d0-c9036f5c0cc9}</UniqueIdentifier> <UniqueIdentifier>{2d571d8f-bacf-4c49-a0d0-c9036f5c0cc9}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="libethereum">
<UniqueIdentifier>{8275e3be-c870-44a2-8185-5a9992af8f8e}</UniqueIdentifier>
</Filter>
<Filter Include="libethcore">
<UniqueIdentifier>{b246b3d7-af02-4125-a254-2b377214c288}</UniqueIdentifier>
</Filter>
<Filter Include="libethsupport">
<UniqueIdentifier>{5f2cd0c1-a3e9-497e-83c4-e56d6c0f835f}</UniqueIdentifier>
</Filter>
<Filter Include="liblll">
<UniqueIdentifier>{0186fc6c-68b3-4cbc-90f2-e01193d853b2}</UniqueIdentifier>
</Filter>
<Filter Include="libevm">
<UniqueIdentifier>{37c37803-1515-47c1-b7e6-3879f4429ab3}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>

2
windows/LibQEthereum.props
View File

@ -5,7 +5,7 @@
<QtDir>../../Qt/$(Platform)</QtDir> <QtDir>../../Qt/$(Platform)</QtDir>
<QtBase>$(QtDir)/qtbase</QtBase> <QtBase>$(QtDir)/qtbase</QtBase>
<QtBin>$(QtBase)/bin</QtBin> <QtBin>$(QtBase)/bin</QtBin>
<QtInclude>$(QtBase)/include;../../Qt/Src/qtbase/include;../../Qt/Src/qtdeclarative/include;../../Qt/Src/qtwebkit/include</QtInclude> <QtInclude>$(QtBase)/include;../../Qt/Src/qtbase/include;../../Qt/Src/qtbase/include/QtCore;../../Qt/Src/qtbase/include/QtWidgets;../../Qt/Src/qtbase/include/QtQml;../../Qt/Src/qtbase/include/QtGui;../../Qt/Src/qtdeclarative/include;../../Qt/Src/qtwebkit/include</QtInclude>
<QtLib>$(QtBase)/lib;$(QtBase)/plugins/platforms;../../icu/lib64</QtLib> <QtLib>$(QtBase)/lib;$(QtBase)/plugins/platforms;../../icu/lib64</QtLib>
<CopyDlls>..\..\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</CopyDlls> <CopyDlls>..\..\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</CopyDlls>
</PropertyGroup> </PropertyGroup>

Write Preview
Loading…
Cancel
Save