Skip to content

Commit e415a47

Browse files
evoskuilevoskuil
committed
Merge pull request #65 from evoskuil/master
Upgrade libsecp256k1 dependency.
2 parents ef00087 + cd0ff21 commit e415a47

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

‎builds/msvc/vs2013/bs/bs.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
<Import Project="..\..\..\..\..\..\nuget\czmqpp_vc120.1.1.0.0\build\native\czmqpp_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\czmqpp_vc120.1.1.0.0\build\native\czmqpp_vc120.targets')" />
125125
<Import Project="..\..\..\..\..\..\nuget\libsodium_vc120.1.0.0.0\build\native\libsodium_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\libsodium_vc120.1.0.0.0\build\native\libsodium_vc120.targets')" />
126126
<Import Project="..\..\..\..\..\..\nuget\libzmq_vc120.4.2.0.0\build\native\libzmq_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\libzmq_vc120.4.2.0.0\build\native\libzmq_vc120.targets')" />
127-
<Import Project="..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.7\build\native\secp256k1_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.7\build\native\secp256k1_vc120.targets')" />
127+
<Import Project="..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.8\build\native\secp256k1_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.8\build\native\secp256k1_vc120.targets')" />
128128
<Import Project="..\..\..\..\..\..\nuget\openssl_no-asm_vc120.1.0.1.800\build\native\openssl_no-asm_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\openssl_no-asm_vc120.1.0.1.800\build\native\openssl_no-asm_vc120.targets')" />
129129
</ImportGroup>
130130
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -142,7 +142,7 @@
142142
<Error Condition="!Exists('..\..\..\..\..\..\nuget\libzmq_vc120.4.2.0.0\build\native\libzmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\libzmq_vc120.4.2.0.0\build\native\libzmq_vc120.targets'))" />
143143
<Error Condition="!Exists('..\..\..\..\..\..\nuget\czmq_vc120.3.0.1.0\build\native\czmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\czmq_vc120.3.0.1.0\build\native\czmq_vc120.targets'))" />
144144
<Error Condition="!Exists('..\..\..\..\..\..\nuget\czmqpp_vc120.1.1.0.0\build\native\czmqpp_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\czmqpp_vc120.1.1.0.0\build\native\czmqpp_vc120.targets'))" />
145-
<Error Condition="!Exists('..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.7\build\native\secp256k1_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.7\build\native\secp256k1_vc120.targets'))" />
145+
<Error Condition="!Exists('..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.8\build\native\secp256k1_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.8\build\native\secp256k1_vc120.targets'))" />
146146
<Error Condition="!Exists('..\..\..\..\..\..\nuget\openssl_no-asm_vc120.1.0.1.800\build\native\openssl_no-asm_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\openssl_no-asm_vc120.1.0.1.800\build\native\openssl_no-asm_vc120.targets'))" />
147147
</Target>
148148
</Project>

‎builds/msvc/vs2013/bs/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
<package id="libsodium_vc120" version="1.0.0.0" targetFramework="Native" />
1313
<package id="libzmq_vc120" version="4.2.0.0" targetFramework="Native" />
1414
<package id="openssl_no-asm_vc120" version="1.0.1.800" targetFramework="Native" />
15-
<package id="secp256k1_vc120" version="0.1.0.7" targetFramework="Native" />
15+
<package id="secp256k1_vc120" version="0.1.0.8" targetFramework="Native" />
1616
</packages>

‎builds/msvc/vs2013/libbitcoin-consensus.import.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<!-- Linkage -->
1515

16-
<ItemDefinitionGroup>
16+
<ItemDefinitionGroup Condition="'$(Linkage-libbitcoin-consensus)' != 'none'">
1717
<ClCompile>
1818
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-consensus\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1919
<PreprocessorDefinitions Condition="'$(Option-secp256k1)' == 'true'">USE_SECP256K1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -47,7 +47,7 @@
4747

4848
<!-- Messages -->
4949

50-
<Target Name="libbitcoin-consensus-option-info" BeforeTargets="PrepareForBuild">
50+
<Target Name="libbitcoin-consensus-option-info" BeforeTargets="PrepareForBuild" Condition="'$(Linkage-libbitcoin-consensus)' != 'none'">
5151
<Message Text="Option-secp256k1 : $(Option-secp256k1)" Importance="high"/>
5252
</Target>
5353

‎install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ build_all()
564564
build_from_github zeromq libzmq master $PARALLEL "$@" $ZMQ_OPTIONS
565565
build_from_github zeromq czmq master $PARALLEL "$@" $CZMQ_OPTIONS
566566
build_from_github zeromq czmqpp master $PARALLEL "$@" $CZMQPP_OPTIONS
567-
build_from_github libbitcoin secp256k1 version2 $PARALLEL "$@" $SECP256K1_OPTIONS
567+
build_from_github libbitcoin secp256k1 version3 $PARALLEL "$@" $SECP256K1_OPTIONS
568568
build_from_github libbitcoin libbitcoin version2 $PARALLEL "$@" $BITCOIN_OPTIONS
569569
build_from_github libbitcoin libbitcoin-consensus version1 $PARALLEL "$@" $BITCOIN_CONSENSUS_OPTIONS
570570
build_from_github libbitcoin libbitcoin-blockchain version2 $PARALLEL "$@" $BITCOIN_BLOCKCHAIN_OPTIONS

0 commit comments

Comments
 (0)