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

Merge pull request #67 from programmerTim/develop 

Compile fixes and compile option updates for VS2013.
cl-refactor
Gav Wood 11 years ago
parent
1f31096062 50af2c564f
commit
677dcb31e9
11 changed files with 156 additions and 22 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. 18
      libethereum/Instruction.cpp
  2. 3
      test/peer.cpp
  3. 3
      test/state.cpp
  4. 7
      windows/Ethereum.vcxproj
  5. 5
      windows/LibEthereum.props
  6. 16
      windows/LibEthereum.vcxproj
  7. 11
      windows/LibEthereum.vcxproj.filters
  8. 25
      windows/TestEthereum.vcxproj
  9. 27
      windows/TestEthereum.vcxproj.filters
  10. 21
      windows/stdafx.cpp
  11. 42
      windows/stdafx.h

18
libethereum/Instruction.cpp
View File

@ -99,7 +99,7 @@ u256s eth::assemble(std::string const& _code, bool _quiet)
if (isdigit(t[0])) if (isdigit(t[0]))
ret.push_back(readNumeric(t, _quiet)); ret.push_back(readNumeric(t, _quiet));
else if (t.back() == ':') else if (t.back() == ':')
known[t.substr(0, t.size() - 1)] = ret.size(); known[t.substr(0, t.size() - 1)] = (unsigned)ret.size();
else else
{ {
auto it = c_instructions.find(boost::algorithm::to_upper_copy(t)); auto it = c_instructions.find(boost::algorithm::to_upper_copy(t));
@ -107,7 +107,7 @@ u256s eth::assemble(std::string const& _code, bool _quiet)
ret.push_back((u256)it->second); ret.push_back((u256)it->second);
else else
{ {
req[ret.size()] = t; req[(unsigned)ret.size()] = t;
ret.push_back(0); ret.push_back(0);
} }
} }
@ -129,7 +129,7 @@ static void appendCode(u256s& o_code, vector<unsigned>& o_locs, u256s _code, vec
for (auto i: _locs) for (auto i: _locs)
{ {
_code[i] += (u256)o_code.size(); _code[i] += (u256)o_code.size();
o_locs.push_back(i + o_code.size()); o_locs.push_back(i + (unsigned)o_code.size());
} }
o_code.reserve(o_code.size() + _code.size()); o_code.reserve(o_code.size() + _code.size());
for (auto i: _code) for (auto i: _code)
@ -232,7 +232,7 @@ static bool compileLispFragment(char const*& d, char const* e, bool _quiet, u256
// Push the positive location. // Push the positive location.
o_code.push_back(Instruction::PUSH); o_code.push_back(Instruction::PUSH);
unsigned posLocation = o_code.size(); unsigned posLocation = (unsigned)o_code.size();
o_locs.push_back(posLocation); o_locs.push_back(posLocation);
o_code.push_back(0); o_code.push_back(0);
@ -247,7 +247,7 @@ static bool compileLispFragment(char const*& d, char const* e, bool _quiet, u256
// Jump to end after negative. // Jump to end after negative.
o_code.push_back(Instruction::PUSH); o_code.push_back(Instruction::PUSH);
unsigned endLocation = o_code.size(); unsigned endLocation = (unsigned)o_code.size();
o_locs.push_back(endLocation); o_locs.push_back(endLocation);
o_code.push_back(0); o_code.push_back(0);
o_code.push_back(Instruction::JMP); o_code.push_back(Instruction::JMP);
@ -272,7 +272,7 @@ static bool compileLispFragment(char const*& d, char const* e, bool _quiet, u256
// Push the positive location. // Push the positive location.
o_code.push_back(Instruction::PUSH); o_code.push_back(Instruction::PUSH);
unsigned endLocation = o_code.size(); unsigned endLocation = (unsigned)o_code.size();
o_locs.push_back(endLocation); o_locs.push_back(endLocation);
o_code.push_back(0); o_code.push_back(0);
@ -301,11 +301,11 @@ static bool compileLispFragment(char const*& d, char const* e, bool _quiet, u256
if (compileLispFragment(d, e, _quiet, codes[2], locs[2])) if (compileLispFragment(d, e, _quiet, codes[2], locs[2]))
return false; return false;
unsigned startLocation = o_code.size(); unsigned startLocation = (unsigned)o_code.size();
// Push the positive location. // Push the positive location.
o_code.push_back(Instruction::PUSH); o_code.push_back(Instruction::PUSH);
unsigned endInsertion = o_code.size(); unsigned endInsertion = (unsigned)o_code.size();
o_locs.push_back(endInsertion); o_locs.push_back(endInsertion);
o_code.push_back(0); o_code.push_back(0);
@ -321,7 +321,7 @@ static bool compileLispFragment(char const*& d, char const* e, bool _quiet, u256
// Jump to end after negative. // Jump to end after negative.
o_code.push_back(Instruction::PUSH); o_code.push_back(Instruction::PUSH);
o_locs.push_back(o_code.size()); o_locs.push_back((unsigned)o_code.size());
o_code.push_back(startLocation); o_code.push_back(startLocation);
o_code.push_back(Instruction::JMP); o_code.push_back(Instruction::JMP);

3
test/peer.cpp
View File

@ -22,6 +22,7 @@
#include <chrono> #include <chrono>
#include <thread> #include <thread>
#include <boost/filesystem/operations.hpp>
#include <BlockChain.h> #include <BlockChain.h>
#include <PeerNetwork.h> #include <PeerNetwork.h>
using namespace std; using namespace std;
@ -47,7 +48,7 @@ int peerTest(int argc, char** argv)
remoteHost = argv[i]; remoteHost = argv[i];
} }
BlockChain ch("/tmp"); BlockChain ch(boost::filesystem::temp_directory_path().string());
PeerServer pn("Test", ch, 0, listenPort); PeerServer pn("Test", ch, 0, listenPort);
if (!remoteHost.empty()) if (!remoteHost.empty())

3
test/state.cpp
View File

@ -20,6 +20,7 @@
* State test functions. * State test functions.
*/ */
#include <boost/filesystem/operations.hpp>
#include <secp256k1.h> #include <secp256k1.h>
#include <BlockChain.h> #include <BlockChain.h>
#include <State.h> #include <State.h>
@ -33,7 +34,7 @@ int stateTest()
KeyPair myMiner = sha3("Gav's Miner"); KeyPair myMiner = sha3("Gav's Miner");
// KeyPair you = sha3("123"); // KeyPair you = sha3("123");
Defaults::setDBPath("/tmp"); Defaults::setDBPath(boost::filesystem::temp_directory_path().string());
Overlay stateDB = State::openDB(); Overlay stateDB = State::openDB();
BlockChain bc; BlockChain bc;

7
windows/Ethereum.vcxproj
View File

@ -69,13 +69,18 @@
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<TargetName>eth</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<TargetName>eth</TargetName>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<TargetName>eth</TargetName>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<TargetName>eth</TargetName>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>

5
windows/LibEthereum.props
View File

@ -8,13 +8,14 @@
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<DisableSpecificWarnings>4100;4127;4505;4512;4706</DisableSpecificWarnings> <DisableSpecificWarnings>4100;4127;4258;4505;4512;4706</DisableSpecificWarnings>
<WarningLevel>Level4</WarningLevel> <WarningLevel>Level4</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<AdditionalIncludeDirectories>include/$(ProjectName);../libethereum;../../boost;../../leveldb/include;../../cryptopp;../secp256k1;../../miniupnp</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>include/$(ProjectName);../libethereum;../../boost;../../leveldb/include;../../cryptopp;../secp256k1;../../miniupnp</AdditionalIncludeDirectories>
<PreprocessorDefinitions>STATICLIB;LEVELDB_PLATFORM_WINDOWS;USE_NUM_BOOST;USE_FIELD_10X26;USE_FIELD_INV_BUILTIN;_WIN32_WINNT=0x0501;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>ETH_VERSION=0.3.3;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>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalLibraryDirectories>../../boost/stage/$(Platform)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>../../boost/stage/$(Platform)</AdditionalLibraryDirectories>

16
windows/LibEthereum.vcxproj
View File

@ -43,6 +43,13 @@
<ClCompile Include="..\libethereum\TrieDB.cpp" /> <ClCompile Include="..\libethereum\TrieDB.cpp" />
<ClCompile Include="..\libethereum\TrieHash.cpp" /> <ClCompile Include="..\libethereum\TrieHash.cpp" />
<ClCompile Include="..\libethereum\UPnP.cpp" /> <ClCompile Include="..\libethereum\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>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\libethereum\AddressState.h" /> <ClInclude Include="..\libethereum\AddressState.h" />
@ -66,6 +73,7 @@
<ClInclude Include="..\libethereum\TrieHash.h" /> <ClInclude Include="..\libethereum\TrieHash.h" />
<ClInclude Include="..\libethereum\UPnP.h" /> <ClInclude Include="..\libethereum\UPnP.h" />
<ClInclude Include="..\libethereum\vector_ref.h" /> <ClInclude Include="..\libethereum\vector_ref.h" />
<ClInclude Include="stdafx.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="LibCryptoPP.vcxproj"> <ProjectReference Include="LibCryptoPP.vcxproj">
@ -139,6 +147,8 @@
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
@ -151,6 +161,8 @@
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
<PrecompiledHeader>Use</PrecompiledHeader>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
@ -167,6 +179,8 @@
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
@ -183,6 +197,8 @@
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>

11
windows/LibEthereum.vcxproj.filters
View File

@ -20,6 +20,9 @@
<ClCompile Include="..\libethereum\AddressState.cpp" /> <ClCompile Include="..\libethereum\AddressState.cpp" />
<ClCompile Include="..\libethereum\BlockChain.cpp" /> <ClCompile Include="..\libethereum\BlockChain.cpp" />
<ClCompile Include="..\libethereum\Instruction.cpp" /> <ClCompile Include="..\libethereum\Instruction.cpp" />
<ClCompile Include="stdafx.cpp">
<Filter>Windows</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\libethereum\BlockInfo.h" /> <ClInclude Include="..\libethereum\BlockInfo.h" />
@ -43,5 +46,13 @@
<ClInclude Include="..\libethereum\vector_ref.h" /> <ClInclude Include="..\libethereum\vector_ref.h" />
<ClInclude Include="..\libethereum\AddressState.h" /> <ClInclude Include="..\libethereum\AddressState.h" />
<ClInclude Include="..\libethereum\BlockChain.h" /> <ClInclude Include="..\libethereum\BlockChain.h" />
<ClInclude Include="stdafx.h">
<Filter>Windows</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="Windows">
<UniqueIdentifier>{2d571d8f-bacf-4c49-a0d0-c9036f5c0cc9}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>

25
windows/TestEthereum.vcxproj
View File

@ -81,13 +81,13 @@
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
</PrecompiledHeader>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<OpenMPSupport>true</OpenMPSupport> <OpenMPSupport>true</OpenMPSupport>
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
@ -97,12 +97,12 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile> <ClCompile>
<PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
</PrecompiledHeader>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
@ -111,8 +111,7 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile> <ClCompile>
<PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
@ -121,6 +120,7 @@
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<OpenMPSupport>true</OpenMPSupport> <OpenMPSupport>true</OpenMPSupport>
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
@ -132,8 +132,7 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile> <ClCompile>
<PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
@ -142,6 +141,7 @@
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<OpenMPSupport>true</OpenMPSupport> <OpenMPSupport>true</OpenMPSupport>
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
@ -165,6 +165,15 @@
<ClCompile Include="..\test\state.cpp" /> <ClCompile Include="..\test\state.cpp" />
<ClCompile Include="..\test\trie.cpp" /> <ClCompile Include="..\test\trie.cpp" />
<ClCompile Include="..\test\vm.cpp" /> <ClCompile Include="..\test\vm.cpp" />
<ClCompile Include="stdafx.cpp">
<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="stdafx.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

27
windows/TestEthereum.vcxproj.filters
View File

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\test\crypto.cpp" />
<ClCompile Include="..\test\dagger.cpp" />
<ClCompile Include="..\test\hexPrefix.cpp" />
<ClCompile Include="..\test\main.cpp" />
<ClCompile Include="..\test\peer.cpp" />
<ClCompile Include="..\test\rlp.cpp" />
<ClCompile Include="..\test\state.cpp" />
<ClCompile Include="..\test\trie.cpp" />
<ClCompile Include="..\test\vm.cpp" />
<ClCompile Include="stdafx.cpp">
<Filter>Windows</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="Windows">
<UniqueIdentifier>{0acd7e2f-2594-4c13-94cb-3247045bdbfd}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="stdafx.h">
<Filter>Windows</Filter>
</ClInclude>
</ItemGroup>
</Project>

21
windows/stdafx.cpp
View File

@ -0,0 +1,21 @@
/*
This file is part of cpp-ethereum.
cpp-ethereum is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
cpp-ethereum is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file stdafx.cpp
* @author Tim Hughes <tim@twistedfury.com>
* @date 2014
*/

42
windows/stdafx.h
View File

@ -0,0 +1,42 @@
/*
This file is part of cpp-ethereum.
cpp-ethereum is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
cpp-ethereum is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file stdafx.h
* @author Tim Hughes <tim@twistedfury.com>
* @date 2014
*/
#pragma once
#include <ctime>
#include <chrono>
#include <array>
#include <vector>
#include <map>
#include <unordered_map>
#include <set>
#include <array>
#include <list>
#include <set>
#include <string>
#include <cassert>
#include <sstream>
#include <cstdint>
#include <type_traits>
#include <assert.h>
#include <boost/filesystem.hpp>
#include <boost/multiprecision/cpp_int.hpp>
#include <boost/thread.hpp>
Write Preview
Loading…
Cancel
Save