Skip to content

Commit

Permalink
Merge pull request #38 from kobake/x64-build
Browse files Browse the repository at this point in the history 
Support x64 build
  • Loading branch information
@kobake
kobake authored Apr 26, 2020
2 parents 6132e87 + 36d98fc commit 0b8e86a
Show file tree
Hide file tree
Showing 16 changed files with 274 additions and 168 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
bin
obj
*.tar.gz

*.exe
Expand Down
36 changes: 22 additions & 14 deletions _bitcoin_common.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,25 +73,33 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<Linkage-secp256k1>static</Linkage-secp256k1>
<OutDir>$(SolutionDir)\bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<Linkage-secp256k1>static</Linkage-secp256k1>
<OutDir>$(SolutionDir)\bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<Linkage-secp256k1>static</Linkage-secp256k1>
<OutDir>$(SolutionDir)\bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<Linkage-secp256k1>static</Linkage-secp256k1>
<OutDir>$(SolutionDir)\bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)/src;$(SolutionDir)/src/config;$(SolutionDir)/src/univalue/include;$(SolutionDir)/db-4.8.30/build_windows</AdditionalIncludeDirectories>
<ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName>
Expand All @@ -108,7 +116,7 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;HAVE_CONFIG_H;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;HAVE_CONFIG_H;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)/src;$(SolutionDir)/src/config;$(SolutionDir)/src/univalue/include;$(SolutionDir)/db-4.8.30/build_windows</AdditionalIncludeDirectories>
<ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName>
Expand All @@ -127,7 +135,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;HAVE_CONFIG_H;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;HAVE_CONFIG_H;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)/src;$(SolutionDir)/src/config;$(SolutionDir)/src/univalue/include;$(SolutionDir)/db-4.8.30/build_windows</AdditionalIncludeDirectories>
<ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName>
Expand All @@ -148,7 +156,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;HAVE_CONFIG_H;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;HAVE_CONFIG_H;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)/src;$(SolutionDir)/src/config;$(SolutionDir)/src/univalue/include;$(SolutionDir)/db-4.8.30/build_windows</AdditionalIncludeDirectories>
<ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName>
Expand Down Expand Up @@ -440,11 +448,6 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="packages\zlib.v120.windesktop.msvcstl.dyn.rt-dyn.1.2.8.8\build\native\zlib.v120.windesktop.msvcstl.dyn.rt-dyn.targets" Condition="Exists('packages\zlib.v120.windesktop.msvcstl.dyn.rt-dyn.1.2.8.8\build\native\zlib.v120.windesktop.msvcstl.dyn.rt-dyn.targets')" />
<Import Project="packages\zlib.v140.windesktop.msvcstl.dyn.rt-dyn.1.2.8.8\build\native\zlib.v140.windesktop.msvcstl.dyn.rt-dyn.targets" Condition="Exists('packages\zlib.v140.windesktop.msvcstl.dyn.rt-dyn.1.2.8.8\build\native\zlib.v140.windesktop.msvcstl.dyn.rt-dyn.targets')" />
<Import Project="packages\libevent2-vc140.2.1.8\build\native\libevent2-vc140.targets" Condition="Exists('packages\libevent2-vc140.2.1.8\build\native\libevent2-vc140.targets')" />
<Import Project="packages\leveldb-vc140.1.16.0.5\build\native\leveldb-vc140.targets" Condition="Exists('packages\leveldb-vc140.1.16.0.5\build\native\leveldb-vc140.targets')" />
<Import Project="packages\miniupnpc-vc140.2.0.0.1\build\native\miniupnpc-vc140.targets" Condition="Exists('packages\miniupnpc-vc140.2.0.0.1\build\native\miniupnpc-vc140.targets')" />
<Import Project="packages\openssl-vc141.1.1.0\build\native\openssl-vc141.targets" Condition="Exists('packages\openssl-vc141.1.1.0\build\native\openssl-vc141.targets')" />
<Import Project="packages\libzmq-vc141.4.2.2\build\native\libzmq-vc141.targets" Condition="Exists('packages\libzmq-vc141.4.2.2\build\native\libzmq-vc141.targets')" />
<Import Project="packages\boost.1.71.0.0\build\boost.targets" Condition="Exists('packages\boost.1.71.0.0\build\boost.targets')" />
<Import Project="packages\boost_atomic-vc142.1.71.0.0\build\boost_atomic-vc142.targets" Condition="Exists('packages\boost_atomic-vc142.1.71.0.0\build\boost_atomic-vc142.targets')" />
<Import Project="packages\boost_bzip2-vc142.1.71.0.0\build\boost_bzip2-vc142.targets" Condition="Exists('packages\boost_bzip2-vc142.1.71.0.0\build\boost_bzip2-vc142.targets')" />
Expand Down Expand Up @@ -488,18 +491,18 @@
<Import Project="packages\boost_zlib-vc142.1.71.0.0\build\boost_zlib-vc142.targets" Condition="Exists('packages\boost_zlib-vc142.1.71.0.0\build\boost_zlib-vc142.targets')" />
<Import Project="packages\boost-vc142.1.71.0.0\build\boost-vc142.targets" Condition="Exists('packages\boost-vc142.1.71.0.0\build\boost-vc142.targets')" />
<Import Project="packages\secp256k1-vc142.0.1.0.15\build\native\secp256k1-vc142.targets" Condition="Exists('packages\secp256k1-vc142.0.1.0.15\build\native\secp256k1-vc142.targets')" />
<Import Project="packages\miniupnpc-vc142.2.0.0\build\native\miniupnpc-vc142.targets" Condition="Exists('packages\miniupnpc-vc142.2.0.0\build\native\miniupnpc-vc142.targets')" />
<Import Project="packages\libzmq-vc142.4.2.3\build\native\libzmq-vc142.targets" Condition="Exists('packages\libzmq-vc142.4.2.3\build\native\libzmq-vc142.targets')" />
<Import Project="packages\leveldb-vc142.1.16.0.5\build\native\leveldb-vc142.targets" Condition="Exists('packages\leveldb-vc142.1.16.0.5\build\native\leveldb-vc142.targets')" />
<Import Project="packages\openssl-vc142.1.1.0\build\native\openssl-vc142.targets" Condition="Exists('packages\openssl-vc142.1.1.0\build\native\openssl-vc142.targets')" />
<Import Project="packages\libevent2-vc142.2.1.8.1\build\native\libevent2-vc142.targets" Condition="Exists('packages\libevent2-vc142.2.1.8.1\build\native\libevent2-vc142.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('packages\zlib.v120.windesktop.msvcstl.dyn.rt-dyn.1.2.8.8\build\native\zlib.v120.windesktop.msvcstl.dyn.rt-dyn.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\zlib.v120.windesktop.msvcstl.dyn.rt-dyn.1.2.8.8\build\native\zlib.v120.windesktop.msvcstl.dyn.rt-dyn.targets'))" />
<Error Condition="!Exists('packages\zlib.v140.windesktop.msvcstl.dyn.rt-dyn.1.2.8.8\build\native\zlib.v140.windesktop.msvcstl.dyn.rt-dyn.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\zlib.v140.windesktop.msvcstl.dyn.rt-dyn.1.2.8.8\build\native\zlib.v140.windesktop.msvcstl.dyn.rt-dyn.targets'))" />
<Error Condition="!Exists('packages\libevent2-vc140.2.1.8\build\native\libevent2-vc140.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\libevent2-vc140.2.1.8\build\native\libevent2-vc140.targets'))" />
<Error Condition="!Exists('packages\leveldb-vc140.1.16.0.5\build\native\leveldb-vc140.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\leveldb-vc140.1.16.0.5\build\native\leveldb-vc140.targets'))" />
<Error Condition="!Exists('packages\miniupnpc-vc140.2.0.0.1\build\native\miniupnpc-vc140.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\miniupnpc-vc140.2.0.0.1\build\native\miniupnpc-vc140.targets'))" />
<Error Condition="!Exists('packages\openssl-vc141.1.1.0\build\native\openssl-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\openssl-vc141.1.1.0\build\native\openssl-vc141.targets'))" />
<Error Condition="!Exists('packages\libzmq-vc141.4.2.2\build\native\libzmq-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\libzmq-vc141.4.2.2\build\native\libzmq-vc141.targets'))" />
<Error Condition="!Exists('packages\boost.1.71.0.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\boost.1.71.0.0\build\boost.targets'))" />
<Error Condition="!Exists('packages\boost_atomic-vc142.1.71.0.0\build\boost_atomic-vc142.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\boost_atomic-vc142.1.71.0.0\build\boost_atomic-vc142.targets'))" />
<Error Condition="!Exists('packages\boost_bzip2-vc142.1.71.0.0\build\boost_bzip2-vc142.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\boost_bzip2-vc142.1.71.0.0\build\boost_bzip2-vc142.targets'))" />
Expand Down Expand Up @@ -543,5 +546,10 @@
<Error Condition="!Exists('packages\boost_zlib-vc142.1.71.0.0\build\boost_zlib-vc142.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\boost_zlib-vc142.1.71.0.0\build\boost_zlib-vc142.targets'))" />
<Error Condition="!Exists('packages\boost-vc142.1.71.0.0\build\boost-vc142.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\boost-vc142.1.71.0.0\build\boost-vc142.targets'))" />
<Error Condition="!Exists('packages\secp256k1-vc142.0.1.0.15\build\native\secp256k1-vc142.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\secp256k1-vc142.0.1.0.15\build\native\secp256k1-vc142.targets'))" />
<Error Condition="!Exists('packages\miniupnpc-vc142.2.0.0\build\native\miniupnpc-vc142.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\miniupnpc-vc142.2.0.0\build\native\miniupnpc-vc142.targets'))" />
<Error Condition="!Exists('packages\libzmq-vc142.4.2.3\build\native\libzmq-vc142.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\libzmq-vc142.4.2.3\build\native\libzmq-vc142.targets'))" />
<Error Condition="!Exists('packages\leveldb-vc142.1.16.0.5\build\native\leveldb-vc142.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\leveldb-vc142.1.16.0.5\build\native\leveldb-vc142.targets'))" />
<Error Condition="!Exists('packages\openssl-vc142.1.1.0\build\native\openssl-vc142.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\openssl-vc142.1.1.0\build\native\openssl-vc142.targets'))" />
<Error Condition="!Exists('packages\libevent2-vc142.2.1.8.1\build\native\libevent2-vc142.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\libevent2-vc142.2.1.8.1\build\native\libevent2-vc142.targets'))" />
</Target>
</Project>
Loading

0 comments on commit 0b8e86a

Please sign in to comment.