Browse Source

Merge pull request #235 from programmerTim/develop

Fixed MSVC build errors and updated projects.
cl-refactor
Gav Wood 11 years ago
parent
commit
860c0e1b09
  1. 2
      alethzero/MiningView.cpp
  2. 18
      liblll/Parser.cpp
  3. 2
      libserpent/parser.cpp
  4. 2
      libserpent/util.cpp
  5. 3
      windows/Alethzero.vcxproj
  6. 2
      windows/Alethzero.vcxproj.filters
  7. 11
      windows/Ethereum.sln
  8. 6
      windows/LibEthereum.props
  9. 64
      windows/LibEthereum.vcxproj
  10. 185
      windows/LibEthereum.vcxproj.filters
  11. 187
      windows/LibSerpent.vcxproj
  12. 18
      windows/LibSerpent.vcxproj.filters

2
alethzero/MiningView.cpp

@ -104,7 +104,7 @@ void MiningView::paintEvent(QPaintEvent*)
Grapher g;
QPainter p(this);
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, (float)m_values.size() * 0.1f)), make_pair(0.0f, 255.f - ((float)m_progress.requirement - 4.0f)), s, id, sL);
g.drawAxes();
g.setDataTransform(0.1f, 0, -1.0f, 255.f);

18
liblll/Parser.cpp

@ -69,9 +69,24 @@ void eth::debugOutAST(ostream& _out, sp::utree const& _this)
}
}
namespace eth {
namespace parseTreeLLL_ {
template<unsigned N>
struct tagNode
{
void operator()(sp::utree& n, qi::rule<string::const_iterator, qi::ascii::space_type, sp::utree()>::context_type& c) const
{
(boost::fusion::at_c<0>(c.attributes) = n).tag(N);
}
};
}}
void eth::parseTreeLLL(string const& _s, sp::utree& o_out)
{
using qi::ascii::space;
using eth::parseTreeLLL_::tagNode;
typedef sp::basic_string<std::string, sp::utree_type::symbol_type> symbol_type;
typedef string::const_iterator it;
@ -96,8 +111,7 @@ void eth::parseTreeLLL(string const& _s, sp::utree& o_out)
qi::rule<it, qi::ascii::space_type, sp::utree::list_type()> calldataload = qi::lit("$") > element;
qi::rule<it, qi::ascii::space_type, sp::utree::list_type()> list = '(' > *element > ')';
auto x = [](int a) { return [=](sp::utree& n, typename qi::rule<it, qi::ascii::space_type, sp::utree()>::context_type& c) { (boost::fusion::at_c<0>(c.attributes) = n).tag(a); }; };
qi::rule<it, qi::ascii::space_type, sp::utree()> extra = sload[x(2)] | mload[x(1)] | sstore[x(4)] | mstore[x(3)] | seq[x(5)] | calldataload[x(6)];
qi::rule<it, qi::ascii::space_type, sp::utree()> extra = sload[tagNode<2>()] | mload[tagNode<1>()] | sstore[tagNode<4>()] | mstore[tagNode<3>()] | seq[tagNode<5>()] | calldataload[tagNode<6>()];
element = atom | list | extra;
string s;

2
libserpent/parser.cpp

@ -54,7 +54,7 @@ std::vector<Node> shuntingYard(std::vector<Node> tokens) {
std::vector<Node> oq;
std::vector<Node> stack;
Node prev, tok;
int prevtyp, toktyp;
int prevtyp, toktyp = 0;
while (iq.size()) {
prev = tok;

2
libserpent/util.cpp

@ -205,7 +205,7 @@ std::string get_file_contents(std::string filename)
{
std::string contents;
in.seekg(0, std::ios::end);
contents.resize(in.tellg());
contents.resize((size_t)in.tellg());
in.seekg(0, std::ios::beg);
in.read(&contents[0], contents.size());
in.close();

3
windows/Alethzero.vcxproj

@ -171,6 +171,9 @@
<ProjectReference Include="LibQEthereum.vcxproj">
<Project>{df3c5b07-a1a2-4f16-b37f-a27333622cdd}</Project>
</ProjectReference>
<ProjectReference Include="LibSerpent.vcxproj">
<Project>{f174e81a-2a66-4693-b917-11bb42d3658c}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\alethzero\Grapher.cpp" />

2
windows/Alethzero.vcxproj.filters

@ -18,7 +18,6 @@
</ClInclude>
<ClInclude Include="..\alethzero\Grapher.h" />
<ClInclude Include="..\alethzero\GraphParameters.h" />
<ClInclude Include="..\alethzero\MiningView.h" />
</ItemGroup>
<ItemGroup>
<Filter Include="Windows">
@ -31,5 +30,6 @@
<CustomBuild Include="BuildInfo.lua">
<Filter>Windows</Filter>
</CustomBuild>
<CustomBuild Include="..\alethzero\MiningView.h" />
</ItemGroup>
</Project>

11
windows/Ethereum.sln

@ -31,6 +31,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eth", "Eth.vcxproj", "{C60C
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "neth", "Neth.vcxproj", "{90C70663-7181-4E99-9079-54188CEB8954}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibSerpent", "LibSerpent.vcxproj", "{F174E81A-2A66-4693-B917-11BB42D3658C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -135,6 +137,14 @@ Global
{90C70663-7181-4E99-9079-54188CEB8954}.Release|Win32.Build.0 = Release|Win32
{90C70663-7181-4E99-9079-54188CEB8954}.Release|x64.ActiveCfg = Release|x64
{90C70663-7181-4E99-9079-54188CEB8954}.Release|x64.Build.0 = Release|x64
{F174E81A-2A66-4693-B917-11BB42D3658C}.Debug|Win32.ActiveCfg = Debug|Win32
{F174E81A-2A66-4693-B917-11BB42D3658C}.Debug|Win32.Build.0 = Debug|Win32
{F174E81A-2A66-4693-B917-11BB42D3658C}.Debug|x64.ActiveCfg = Debug|x64
{F174E81A-2A66-4693-B917-11BB42D3658C}.Debug|x64.Build.0 = Debug|x64
{F174E81A-2A66-4693-B917-11BB42D3658C}.Release|Win32.ActiveCfg = Release|Win32
{F174E81A-2A66-4693-B917-11BB42D3658C}.Release|Win32.Build.0 = Release|Win32
{F174E81A-2A66-4693-B917-11BB42D3658C}.Release|x64.ActiveCfg = Release|x64
{F174E81A-2A66-4693-B917-11BB42D3658C}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -146,6 +156,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}
{F174E81A-2A66-4693-B917-11BB42D3658C} = {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

6
windows/LibEthereum.props

@ -11,14 +11,14 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<DisableSpecificWarnings>4068;4100;4127;4258;4244;4267;4505;4512;4706;4714</DisableSpecificWarnings>
<WarningLevel>Level4</WarningLevel>
<DisableSpecificWarnings>4068;4244;4267</DisableSpecificWarnings>
<TreatWarningAsError>true</TreatWarningAsError>
<MinimalRebuild>false</MinimalRebuild>
<AdditionalIncludeDirectories>include/$(ProjectName);$(IntDir);..;../libethcore;../libethereum;../libethsupport;$(BoostDir);../../leveldb/include;../../cryptopp;../secp256k1;../../miniupnp</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>include/$(ProjectName);$(IntDir);../../cryptopp;..;../libethcore;../libethereum;../libethsupport;$(BoostDir);../../leveldb/include;../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>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(BoostDir)/stage/$(Platform)</AdditionalLibraryDirectories>

64
windows/LibEthereum.vcxproj

@ -22,7 +22,19 @@
<ClCompile Include="..\libethcore\BlockInfo.cpp" />
<ClCompile Include="..\libethcore\CommonEth.cpp" />
<ClCompile Include="..\libethcore\Dagger.cpp" />
<ClCompile Include="..\libethcore\Instruction.cpp" />
<ClCompile Include="..\libethcore\FileSystem.cpp" />
<ClCompile Include="..\libethcore\MemoryDB.cpp" />
<ClCompile Include="..\libethcore\OverlayDB.cpp" />
<ClCompile Include="..\libethcore\SHA3.cpp" />
<ClCompile Include="..\libethcore\TrieCommon.cpp" />
<ClCompile Include="..\libethcore\TrieDB.cpp" />
<ClCompile Include="..\libethcore\UPnP.cpp" />
<ClCompile Include="..\libethential\Common.cpp" />
<ClCompile Include="..\libethential\CommonData.cpp" />
<ClCompile Include="..\libethential\CommonIO.cpp" />
<ClCompile Include="..\libethential\FixedHash.cpp" />
<ClCompile Include="..\libethential\Log.cpp" />
<ClCompile Include="..\libethential\RLP.cpp" />
<ClCompile Include="..\libethereum\AddressState.cpp" />
<ClCompile Include="..\libethereum\BlockChain.cpp" />
<ClCompile Include="..\libethereum\Client.cpp" />
@ -35,18 +47,7 @@
<ClCompile Include="..\libethereum\State.cpp" />
<ClCompile Include="..\libethereum\Transaction.cpp" />
<ClCompile Include="..\libethereum\TransactionQueue.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="..\libevmface\Instruction.cpp" />
<ClCompile Include="..\libevm\ExtVMFace.cpp" />
<ClCompile Include="..\libevm\FeeStructure.cpp" />
<ClCompile Include="..\libevm\VM.cpp" />
@ -64,11 +65,28 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\libethcore\All.h" />
<ClInclude Include="..\libethcore\BlockInfo.h" />
<ClInclude Include="..\libethcore\CommonEth.h" />
<ClInclude Include="..\libethcore\CryptoHeaders.h" />
<ClInclude Include="..\libethcore\Dagger.h" />
<ClInclude Include="..\libethcore\Exceptions.h" />
<ClInclude Include="..\libethcore\Instruction.h" />
<ClInclude Include="..\libethcore\FileSystem.h" />
<ClInclude Include="..\libethcore\MemoryDB.h" />
<ClInclude Include="..\libethcore\OverlayDB.h" />
<ClInclude Include="..\libethcore\SHA3.h" />
<ClInclude Include="..\libethcore\TrieCommon.h" />
<ClInclude Include="..\libethcore\TrieDB.h" />
<ClInclude Include="..\libethcore\UPnP.h" />
<ClInclude Include="..\libethential\All.h" />
<ClInclude Include="..\libethential\Common.h" />
<ClInclude Include="..\libethential\CommonData.h" />
<ClInclude Include="..\libethential\CommonIO.h" />
<ClInclude Include="..\libethential\Exceptions.h" />
<ClInclude Include="..\libethential\FixedHash.h" />
<ClInclude Include="..\libethential\Log.h" />
<ClInclude Include="..\libethential\RLP.h" />
<ClInclude Include="..\libethential\vector_ref.h" />
<ClInclude Include="..\libethereum\AddressState.h" />
<ClInclude Include="..\libethereum\BlockChain.h" />
<ClInclude Include="..\libethereum\Client.h" />
@ -81,24 +99,12 @@
<ClInclude Include="..\libethereum\State.h" />
<ClInclude Include="..\libethereum\Transaction.h" />
<ClInclude Include="..\libethereum\TransactionQueue.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="..\libevmface\Instruction.h" />
<ClInclude Include="..\libevm\All.h" />
<ClInclude Include="..\libevm\ExtVMFace.h" />
<ClInclude Include="..\libevm\FeeStructure.h" />
<ClInclude Include="..\libevm\VM.h" />
<ClInclude Include="..\liblll\All.h" />
<ClInclude Include="..\liblll\Assembly.h" />
<ClInclude Include="..\liblll\CodeFragment.h" />
<ClInclude Include="..\liblll\Compiler.h" />

185
windows/LibEthereum.vcxproj.filters

@ -49,44 +49,56 @@
<ClCompile Include="..\libethcore\Dagger.cpp">
<Filter>libethcore</Filter>
</ClCompile>
<ClCompile Include="..\libethcore\Instruction.cpp">
<Filter>libethcore</Filter>
<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>
<ClCompile Include="..\libethsupport\Common.cpp">
<Filter>libethsupport</Filter>
<ClCompile Include="..\libethential\Common.cpp">
<Filter>libethential</Filter>
</ClCompile>
<ClCompile Include="..\libethsupport\CommonData.cpp">
<Filter>libethsupport</Filter>
<ClCompile Include="..\libethential\CommonData.cpp">
<Filter>libethential</Filter>
</ClCompile>
<ClCompile Include="..\libethsupport\CommonIO.cpp">
<Filter>libethsupport</Filter>
<ClCompile Include="..\libethential\CommonIO.cpp">
<Filter>libethential</Filter>
</ClCompile>
<ClCompile Include="..\libethsupport\FileSystem.cpp">
<Filter>libethsupport</Filter>
<ClCompile Include="..\libethential\FixedHash.cpp">
<Filter>libethential</Filter>
</ClCompile>
<ClCompile Include="..\libethsupport\FixedHash.cpp">
<Filter>libethsupport</Filter>
<ClCompile Include="..\libethential\Log.cpp">
<Filter>libethential</Filter>
</ClCompile>
<ClCompile Include="..\libethsupport\Log.cpp">
<Filter>libethsupport</Filter>
<ClCompile Include="..\libethential\RLP.cpp">
<Filter>libethential</Filter>
</ClCompile>
<ClCompile Include="..\libethsupport\MemoryDB.cpp">
<Filter>libethsupport</Filter>
<ClCompile Include="..\libevmface\Instruction.cpp">
<Filter>libevmface</Filter>
</ClCompile>
<ClCompile Include="..\libethsupport\OverlayDB.cpp">
<Filter>libethsupport</Filter>
<ClCompile Include="..\libethcore\FileSystem.cpp">
<Filter>libethcore</Filter>
</ClCompile>
<ClCompile Include="..\libethsupport\RLP.cpp">
<Filter>libethsupport</Filter>
<ClCompile Include="..\libethcore\MemoryDB.cpp">
<Filter>libethcore</Filter>
</ClCompile>
<ClCompile Include="..\libethsupport\TrieCommon.cpp">
<Filter>libethsupport</Filter>
<ClCompile Include="..\libethcore\OverlayDB.cpp">
<Filter>libethcore</Filter>
</ClCompile>
<ClCompile Include="..\libethsupport\TrieDB.cpp">
<Filter>libethsupport</Filter>
<ClCompile Include="..\libethcore\SHA3.cpp">
<Filter>libethcore</Filter>
</ClCompile>
<ClCompile Include="..\libethsupport\UPnP.cpp">
<Filter>libethsupport</Filter>
<ClCompile Include="..\libethcore\TrieCommon.cpp">
<Filter>libethcore</Filter>
</ClCompile>
<ClCompile Include="..\libethcore\TrieDB.cpp">
<Filter>libethcore</Filter>
</ClCompile>
<ClCompile Include="..\libethcore\UPnP.cpp">
<Filter>libethcore</Filter>
</ClCompile>
<ClCompile Include="..\liblll\Assembly.cpp">
<Filter>liblll</Filter>
@ -103,15 +115,6 @@
<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>
<ClInclude Include="stdafx.h">
@ -165,53 +168,77 @@
<ClInclude Include="..\libethcore\Exceptions.h">
<Filter>libethcore</Filter>
</ClInclude>
<ClInclude Include="..\libethcore\Instruction.h">
<Filter>libethcore</Filter>
<ClInclude Include="..\libevm\ExtVMFace.h">
<Filter>libevm</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\Common.h">
<Filter>libethsupport</Filter>
<ClInclude Include="..\libevm\FeeStructure.h">
<Filter>libevm</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\CommonData.h">
<Filter>libethsupport</Filter>
<ClInclude Include="..\libevm\VM.h">
<Filter>libevm</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\CommonIO.h">
<Filter>libethsupport</Filter>
<ClInclude Include="..\libethential\All.h">
<Filter>libethential</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\CryptoHeaders.h">
<Filter>libethsupport</Filter>
<ClInclude Include="..\libethential\Common.h">
<Filter>libethential</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\Exceptions.h">
<Filter>libethsupport</Filter>
<ClInclude Include="..\libethential\CommonData.h">
<Filter>libethential</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\FileSystem.h">
<Filter>libethsupport</Filter>
<ClInclude Include="..\libethential\CommonIO.h">
<Filter>libethential</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\FixedHash.h">
<Filter>libethsupport</Filter>
<ClInclude Include="..\libethential\Exceptions.h">
<Filter>libethential</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\Log.h">
<Filter>libethsupport</Filter>
<ClInclude Include="..\libethential\FixedHash.h">
<Filter>libethential</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\MemoryDB.h">
<Filter>libethsupport</Filter>
<ClInclude Include="..\libethential\Log.h">
<Filter>libethential</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\OverlayDB.h">
<Filter>libethsupport</Filter>
<ClInclude Include="..\libethential\RLP.h">
<Filter>libethential</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\RLP.h">
<Filter>libethsupport</Filter>
<ClInclude Include="..\libethential\vector_ref.h">
<Filter>libethential</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\TrieCommon.h">
<Filter>libethsupport</Filter>
<ClInclude Include="..\libevm\All.h">
<Filter>libevm</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\TrieDB.h">
<Filter>libethsupport</Filter>
<ClInclude Include="..\libevmface\Instruction.h">
<Filter>libevmface</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\UPnP.h">
<Filter>libethsupport</Filter>
<ClInclude Include="..\libethcore\All.h">
<Filter>libethcore</Filter>
</ClInclude>
<ClInclude Include="..\libethcore\CryptoHeaders.h">
<Filter>libethcore</Filter>
</ClInclude>
<ClInclude Include="..\libethcore\FileSystem.h">
<Filter>libethcore</Filter>
</ClInclude>
<ClInclude Include="..\libethcore\MemoryDB.h">
<Filter>libethcore</Filter>
</ClInclude>
<ClInclude Include="..\libethcore\OverlayDB.h">
<Filter>libethcore</Filter>
</ClInclude>
<ClInclude Include="..\libethcore\SHA3.h">
<Filter>libethcore</Filter>
</ClInclude>
<ClInclude Include="..\libethcore\TrieCommon.h">
<Filter>libethcore</Filter>
</ClInclude>
<ClInclude Include="..\libethcore\TrieDB.h">
<Filter>libethcore</Filter>
</ClInclude>
<ClInclude Include="..\libethcore\UPnP.h">
<Filter>libethcore</Filter>
</ClInclude>
<ClInclude Include="..\libethsupport\vector_ref.h">
<Filter>libethsupport</Filter>
<ClInclude Include="..\liblll\All.h">
<Filter>liblll</Filter>
</ClInclude>
<ClInclude Include="..\liblll\Assembly.h">
<Filter>liblll</Filter>
@ -231,15 +258,6 @@
<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>
<Filter Include="Windows">
@ -251,14 +269,17 @@
<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>
<Filter Include="libevmface">
<UniqueIdentifier>{ed9ad1b3-700c-47f9-8548-a90b5ef179ac}</UniqueIdentifier>
</Filter>
<Filter Include="libethential">
<UniqueIdentifier>{35c32f6c-3f19-4603-8084-1b88ec9ae498}</UniqueIdentifier>
</Filter>
<Filter Include="liblll">
<UniqueIdentifier>{e6332606-e0ca-48aa-8a6b-303971ba7a93}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>

187
windows/LibSerpent.vcxproj

@ -0,0 +1,187 @@
<?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>
<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>
<ItemGroup>
<ClInclude Include="..\libserpent\All.h" />
<ClInclude Include="..\libserpent\bignum.h" />
<ClInclude Include="..\libserpent\compiler.h" />
<ClInclude Include="..\libserpent\funcs.h" />
<ClInclude Include="..\libserpent\lllparser.h" />
<ClInclude Include="..\libserpent\opcodes.h" />
<ClInclude Include="..\libserpent\parser.h" />
<ClInclude Include="..\libserpent\rewriter.h" />
<ClInclude Include="..\libserpent\tokenize.h" />
<ClInclude Include="..\libserpent\util.h" />
<ClInclude Include="stdafx.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\libserpent\bignum.cpp" />
<ClCompile Include="..\libserpent\compiler.cpp" />
<ClCompile Include="..\libserpent\funcs.cpp" />
<ClCompile Include="..\libserpent\lllparser.cpp" />
<ClCompile Include="..\libserpent\parser.cpp" />
<ClCompile Include="..\libserpent\rewriter.cpp" />
<ClCompile Include="..\libserpent\tokenize.cpp" />
<ClCompile Include="..\libserpent\util.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<PropertyGroup Label="Globals">
<Keyword>Win32Proj</Keyword>
<RootNamespace>LibSerpent</RootNamespace>
<ProjectGuid>{F174E81A-2A66-4693-B917-11BB42D3658C}</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>

18
windows/LibSerpent.vcxproj.filters

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Windows">
<UniqueIdentifier>{20ea55ad-2a66-41df-a64e-9fed221f544f}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="stdafx.cpp">
<Filter>Windows</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="stdafx.h">
<Filter>Windows</Filter>
</ClInclude>
</ItemGroup>
</Project>
Loading…
Cancel
Save