Skip to content
This repository was archived by the owner on Oct 28, 2021. It is now read-only.

Commit 0dc9bc8

Browse files
TiimJiimTiimJiim
committed
Projects, solution and fixes for Visual Studio 2013.
1 parent 631cbd7 commit 0dc9bc8

19 files changed

+719
-33
lines changed

‎.gitignore‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,11 @@
1212
*.la
1313
*.a
1414

15+
# VS stuff
16+
build
17+
ipch
18+
*.sdf
19+
*.opensdf
20+
*.suo
21+
1522
*.user

‎Ethereum.sln‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Express 2013 for Windows Desktop
4+
VisualStudioVersion = 12.0.21005.1
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibEthereum", "libethereum\LibEthereum.vcxproj", "{7050C7CF-7551-48BE-8E57-92235906C13A}"
7+
EndProject
8+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestMining", "test\TestMining.vcxproj", "{02DC8A9B-DEF7-403B-8AE3-EF9680937D96}"
9+
EndProject
10+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "test\Test.vcxproj", "{3F3E389B-88DE-41D5-A73B-4F6036E18B36}"
11+
EndProject
12+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptlib", "..\cryptopp562\cryptlib.vcxproj", "{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}"
13+
EndProject
14+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ethereum", "eth\Ethereum.vcxproj", "{C60C065C-2135-4B2B-AFD4-35FD7AC56B40}"
15+
EndProject
16+
Global
17+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
18+
Debug|Win32 = Debug|Win32
19+
Debug|x64 = Debug|x64
20+
Release|Win32 = Release|Win32
21+
Release|x64 = Release|x64
22+
EndGlobalSection
23+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
24+
{7050C7CF-7551-48BE-8E57-92235906C13A}.Debug|Win32.ActiveCfg = Debug|Win32
25+
{7050C7CF-7551-48BE-8E57-92235906C13A}.Debug|Win32.Build.0 = Debug|Win32
26+
{7050C7CF-7551-48BE-8E57-92235906C13A}.Debug|x64.ActiveCfg = Debug|x64
27+
{7050C7CF-7551-48BE-8E57-92235906C13A}.Debug|x64.Build.0 = Debug|x64
28+
{7050C7CF-7551-48BE-8E57-92235906C13A}.Release|Win32.ActiveCfg = Release|Win32
29+
{7050C7CF-7551-48BE-8E57-92235906C13A}.Release|Win32.Build.0 = Release|Win32
30+
{7050C7CF-7551-48BE-8E57-92235906C13A}.Release|x64.ActiveCfg = Release|x64
31+
{7050C7CF-7551-48BE-8E57-92235906C13A}.Release|x64.Build.0 = Release|x64
32+
{02DC8A9B-DEF7-403B-8AE3-EF9680937D96}.Debug|Win32.ActiveCfg = Debug|Win32
33+
{02DC8A9B-DEF7-403B-8AE3-EF9680937D96}.Debug|Win32.Build.0 = Debug|Win32
34+
{02DC8A9B-DEF7-403B-8AE3-EF9680937D96}.Debug|x64.ActiveCfg = Debug|x64
35+
{02DC8A9B-DEF7-403B-8AE3-EF9680937D96}.Debug|x64.Build.0 = Debug|x64
36+
{02DC8A9B-DEF7-403B-8AE3-EF9680937D96}.Release|Win32.ActiveCfg = Release|Win32
37+
{02DC8A9B-DEF7-403B-8AE3-EF9680937D96}.Release|Win32.Build.0 = Release|Win32
38+
{02DC8A9B-DEF7-403B-8AE3-EF9680937D96}.Release|x64.ActiveCfg = Release|x64
39+
{02DC8A9B-DEF7-403B-8AE3-EF9680937D96}.Release|x64.Build.0 = Release|x64
40+
{3F3E389B-88DE-41D5-A73B-4F6036E18B36}.Debug|Win32.ActiveCfg = Debug|Win32
41+
{3F3E389B-88DE-41D5-A73B-4F6036E18B36}.Debug|Win32.Build.0 = Debug|Win32
42+
{3F3E389B-88DE-41D5-A73B-4F6036E18B36}.Debug|x64.ActiveCfg = Debug|x64
43+
{3F3E389B-88DE-41D5-A73B-4F6036E18B36}.Debug|x64.Build.0 = Debug|x64
44+
{3F3E389B-88DE-41D5-A73B-4F6036E18B36}.Release|Win32.ActiveCfg = Release|Win32
45+
{3F3E389B-88DE-41D5-A73B-4F6036E18B36}.Release|Win32.Build.0 = Release|Win32
46+
{3F3E389B-88DE-41D5-A73B-4F6036E18B36}.Release|x64.ActiveCfg = Release|x64
47+
{3F3E389B-88DE-41D5-A73B-4F6036E18B36}.Release|x64.Build.0 = Release|x64
48+
{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.ActiveCfg = Debug|Win32
49+
{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.Build.0 = Debug|Win32
50+
{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|x64.ActiveCfg = Debug|x64
51+
{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|x64.Build.0 = Debug|x64
52+
{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.ActiveCfg = Release|Win32
53+
{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.Build.0 = Release|Win32
54+
{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|x64.ActiveCfg = Release|x64
55+
{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|x64.Build.0 = Release|x64
56+
{C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Debug|Win32.ActiveCfg = Debug|Win32
57+
{C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Debug|Win32.Build.0 = Debug|Win32
58+
{C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Debug|x64.ActiveCfg = Debug|x64
59+
{C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Debug|x64.Build.0 = Debug|x64
60+
{C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Release|Win32.ActiveCfg = Release|Win32
61+
{C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Release|Win32.Build.0 = Release|Win32
62+
{C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Release|x64.ActiveCfg = Release|x64
63+
{C60C065C-2135-4B2B-AFD4-35FD7AC56B40}.Release|x64.Build.0 = Release|x64
64+
EndGlobalSection
65+
GlobalSection(SolutionProperties) = preSolution
66+
HideSolutionNode = FALSE
67+
EndGlobalSection
68+
EndGlobal

‎eth/Ethereum.vcxproj‎

Lines changed: 184 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,184 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Release|Win32">
13+
<Configuration>Release</Configuration>
14+
<Platform>Win32</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<PropertyGroup Label="Globals">
22+
<Keyword>Win32Proj</Keyword>
23+
<RootNamespace>Ethereum</RootNamespace>
24+
<ProjectName>Ethereum</ProjectName>
25+
<ProjectGuid>{C60C065C-2135-4B2B-AFD4-35FD7AC56B40}</ProjectGuid>
26+
</PropertyGroup>
27+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
28+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
29+
<ConfigurationType>Application</ConfigurationType>
30+
<UseDebugLibraries>true</UseDebugLibraries>
31+
<PlatformToolset>v120</PlatformToolset>
32+
<CharacterSet>Unicode</CharacterSet>
33+
</PropertyGroup>
34+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
35+
<ConfigurationType>Application</ConfigurationType>
36+
<UseDebugLibraries>true</UseDebugLibraries>
37+
<PlatformToolset>v120</PlatformToolset>
38+
<CharacterSet>Unicode</CharacterSet>
39+
</PropertyGroup>
40+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
41+
<ConfigurationType>Application</ConfigurationType>
42+
<UseDebugLibraries>false</UseDebugLibraries>
43+
<PlatformToolset>v120</PlatformToolset>
44+
<WholeProgramOptimization>true</WholeProgramOptimization>
45+
<CharacterSet>Unicode</CharacterSet>
46+
</PropertyGroup>
47+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
48+
<ConfigurationType>Application</ConfigurationType>
49+
<UseDebugLibraries>false</UseDebugLibraries>
50+
<PlatformToolset>v120</PlatformToolset>
51+
<WholeProgramOptimization>true</WholeProgramOptimization>
52+
<CharacterSet>Unicode</CharacterSet>
53+
</PropertyGroup>
54+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
55+
<ImportGroup Label="ExtensionSettings">
56+
</ImportGroup>
57+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
58+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
59+
<Import Project="..\libethereum\LibEthereum.props" />
60+
</ImportGroup>
61+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
62+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
63+
<Import Project="..\libethereum\LibEthereum.props" />
64+
</ImportGroup>
65+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
66+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
67+
<Import Project="..\libethereum\LibEthereum.props" />
68+
</ImportGroup>
69+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
70+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
71+
<Import Project="..\libethereum\LibEthereum.props" />
72+
</ImportGroup>
73+
<PropertyGroup Label="UserMacros" />
74+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
75+
<LinkIncremental>true</LinkIncremental>
76+
</PropertyGroup>
77+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
78+
<LinkIncremental>true</LinkIncremental>
79+
</PropertyGroup>
80+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
81+
<LinkIncremental>false</LinkIncremental>
82+
</PropertyGroup>
83+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
84+
<LinkIncremental>false</LinkIncremental>
85+
</PropertyGroup>
86+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
87+
<ClCompile>
88+
<PrecompiledHeader>
89+
</PrecompiledHeader>
90+
<Optimization>Disabled</Optimization>
91+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
92+
<AdditionalIncludeDirectories>../libethereum</AdditionalIncludeDirectories>
93+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
94+
<IntrinsicFunctions>true</IntrinsicFunctions>
95+
<RuntimeTypeInfo>false</RuntimeTypeInfo>
96+
<OpenMPSupport>true</OpenMPSupport>
97+
<DisableSpecificWarnings>4351</DisableSpecificWarnings>
98+
</ClCompile>
99+
<Link>
100+
<SubSystem>Console</SubSystem>
101+
<GenerateDebugInformation>true</GenerateDebugInformation>
102+
<LargeAddressAware>true</LargeAddressAware>
103+
</Link>
104+
</ItemDefinitionGroup>
105+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
106+
<ClCompile>
107+
<PrecompiledHeader>
108+
</PrecompiledHeader>
109+
<Optimization>Disabled</Optimization>
110+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
111+
<AdditionalIncludeDirectories>../libethereum</AdditionalIncludeDirectories>
112+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
113+
<IntrinsicFunctions>true</IntrinsicFunctions>
114+
<RuntimeTypeInfo>false</RuntimeTypeInfo>
115+
<OpenMPSupport>true</OpenMPSupport>
116+
<DisableSpecificWarnings>4351</DisableSpecificWarnings>
117+
</ClCompile>
118+
<Link>
119+
<SubSystem>Console</SubSystem>
120+
<GenerateDebugInformation>true</GenerateDebugInformation>
121+
</Link>
122+
</ItemDefinitionGroup>
123+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
124+
<ClCompile>
125+
<PrecompiledHeader>
126+
</PrecompiledHeader>
127+
<Optimization>MaxSpeed</Optimization>
128+
<FunctionLevelLinking>true</FunctionLevelLinking>
129+
<IntrinsicFunctions>true</IntrinsicFunctions>
130+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
131+
<AdditionalIncludeDirectories>../libethereum</AdditionalIncludeDirectories>
132+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
133+
<StringPooling>true</StringPooling>
134+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
135+
<RuntimeTypeInfo>false</RuntimeTypeInfo>
136+
<OpenMPSupport>true</OpenMPSupport>
137+
<DisableSpecificWarnings>4351</DisableSpecificWarnings>
138+
</ClCompile>
139+
<Link>
140+
<SubSystem>Console</SubSystem>
141+
<GenerateDebugInformation>true</GenerateDebugInformation>
142+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
143+
<OptimizeReferences>true</OptimizeReferences>
144+
<LargeAddressAware>true</LargeAddressAware>
145+
</Link>
146+
</ItemDefinitionGroup>
147+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
148+
<ClCompile>
149+
<PrecompiledHeader>
150+
</PrecompiledHeader>
151+
<Optimization>MaxSpeed</Optimization>
152+
<FunctionLevelLinking>true</FunctionLevelLinking>
153+
<IntrinsicFunctions>true</IntrinsicFunctions>
154+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
155+
<AdditionalIncludeDirectories>../libethereum</AdditionalIncludeDirectories>
156+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
157+
<StringPooling>true</StringPooling>
158+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
159+
<RuntimeTypeInfo>false</RuntimeTypeInfo>
160+
<OpenMPSupport>true</OpenMPSupport>
161+
<DisableSpecificWarnings>4351</DisableSpecificWarnings>
162+
</ClCompile>
163+
<Link>
164+
<SubSystem>Console</SubSystem>
165+
<GenerateDebugInformation>true</GenerateDebugInformation>
166+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
167+
<OptimizeReferences>true</OptimizeReferences>
168+
</Link>
169+
</ItemDefinitionGroup>
170+
<ItemGroup>
171+
<ProjectReference Include="..\..\cryptopp562\cryptlib.vcxproj">
172+
<Project>{3423ec9a-52e4-4a4d-9753-edebc38785ef}</Project>
173+
</ProjectReference>
174+
<ProjectReference Include="..\libethereum\LibEthereum.vcxproj">
175+
<Project>{7050c7cf-7551-48be-8e57-92235906c13a}</Project>
176+
</ProjectReference>
177+
</ItemGroup>
178+
<ItemGroup>
179+
<ClCompile Include="main.cpp" />
180+
</ItemGroup>
181+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
182+
<ImportGroup Label="ExtensionTargets">
183+
</ImportGroup>
184+
</Project>

‎libethereum/BlockChain.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#pragma once
2323

2424
#include "Common.h"
25-
#include <leveldb/db.h>
2625
namespace ldb = leveldb;
2726

2827
namespace eth

‎libethereum/Common.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
* @date 2014
2020
*/
2121

22+
#pragma warning(push)
23+
#pragma warning(disable:4244)
2224
#include <sha3.h>
25+
#pragma warning(pop)
2326
#include <random>
2427
#include "Common.h"
2528
#include "Exceptions.h"
@@ -79,7 +82,7 @@ bytes eth::fromUserHex(std::string const& _s)
7982
std::vector<uint8_t> ret;
8083
ret.reserve((_s.size() - s) / 2);
8184
for (uint i = s; i < _s.size(); i += 2)
82-
ret.push_back(fromHex(_s[i]) * 16 + fromHex(_s[i + 1]));
85+
ret.push_back((byte)(fromHex(_s[i]) * 16 + fromHex(_s[i + 1])));
8386
return ret;
8487
}
8588

‎libethereum/Common.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@
2323

2424
#pragma once
2525

26+
// way to many uint to size_t warnings in 32 bit build
27+
#ifdef _M_IX86
28+
#pragma warning(disable:4244)
29+
#endif
30+
2631
#include <array>
2732
#include <map>
2833
#include <set>

‎libethereum/Dagger.cpp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
#include <boost/detail/endian.hpp>
22
#include <chrono>
33
#include <array>
4+
#pragma warning(push)
5+
#pragma warning(disable:4244)
46
#include <sha3.h>
7+
#pragma warning(pop)
58
#include <random>
69
#include "Common.h"
710
#include "Dagger.h"
@@ -44,7 +47,8 @@ inline void update(_T& _sha, _U const& _value)
4447
int i = 0;
4548
for (_U v = _value; v; ++i, v >>= 8) {}
4649
byte buf[32];
47-
toBigEndian(_value, bytesRef(buf, i));
50+
bytesRef bufRef(buf, i);
51+
toBigEndian(_value, bufRef);
4852
_sha.Update(buf, i);
4953
}
5054

‎libethereum/LibEthereum.props‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ImportGroup Label="PropertySheets" />
4+
<PropertyGroup Label="UserMacros" />
5+
<PropertyGroup>
6+
<IncludePath>$(IncludePath);../../boost_1_55_0;../../leveldb-1.15.0/include;../../cryptopp562;../../secp256k1/include</IncludePath>
7+
<OutDir>..\build\$(ProjectName)\$(Platform)_$(Configuration)\</OutDir>
8+
<IntDir>..\build\$(ProjectName)\$(Platform)_$(Configuration)\</IntDir>
9+
</PropertyGroup>
10+
<ItemDefinitionGroup>
11+
<ClCompile>
12+
<DisableSpecificWarnings>4100;4127;4505;4512;</DisableSpecificWarnings>
13+
<WarningLevel>Level4</WarningLevel>
14+
<TreatWarningAsError>true</TreatWarningAsError>
15+
<MinimalRebuild>false</MinimalRebuild>
16+
</ClCompile>
17+
</ItemDefinitionGroup>
18+
<ItemGroup />
19+
</Project>

0 commit comments

Comments
 (0)