Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes to allow building with msvc. #14

Merged
merged 1 commit into from
Jan 16, 2019
Merged

Fixes to allow building with msvc. #14

merged 1 commit into from
Jan 16, 2019

Conversation

sipsorcery
Copy link

This PR would be very handy to facilitate building bitcoin with msvc.

The relevant parts of the patch were submitted upstream to the main leveldb source but there looks to be a bigger Windows port going on there at the moment.

@@ -32,9 +32,16 @@
#define STORAGE_LEVELDB_PORT_PORT_WIN_H_

#ifdef _MSC_VER
#if !(_MSC_VER >= 1900)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that would be clearer as _MSC_VER < 1900.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like #7 has extended fix for it.

@NicolasDorier
Copy link

tACK, we are using this for our windows build.

@ken2812221
Copy link

ken2812221 commented Oct 3, 2018

tACK d6eab93

@laanwj laanwj merged commit d6eab93 into bitcoin-core:bitcoin-fork Jan 16, 2019
laanwj added a commit that referenced this pull request Jan 16, 2019
d6eab93 Fixes to allow building with msvc. (Aaron Clauson)

Pull request description:

  This PR would be very handy to facilitate building bitcoin with msvc.

  The [relevant parts of the patch were submitted](google#521) upstream to the main leveldb source but there looks to be a bigger Windows port going on there at the moment.

Tree-SHA512: 0183c6fb189ee3446c2de1f02b514dcb77b2e1d6524e127be2e396575eb6106e1081143b4b5a2a91c9cc8424dfcfc0230c4b4c55db6a66dceb6f61fb89f90f5a
maflcko pushed a commit to maflcko/bitcoin-core that referenced this pull request Jan 31, 2019
82dcacb msvc: build leveldb locally (Chun Kuan Lee)
5209106 msvc: build secp256k1 locally (Chun Kuan Lee)

Pull request description:

  In current MSVC build setup, the code depends on leveldb and secp256k1 that are installed from vcpkg which is not controlled by us. If we update our code, we have to wait for vcpkg port being merged.

  This PR move them from vcpkg to local branch to make it as same as autoconf.

  The leveldb changes is based on bitcoin-core/leveldb-subtree#14 and bitcoin-core/leveldb-subtree#18

Tree-SHA512: aa2cc1c3191e8d9cab23d555da4be296314c46d944f452c2ec6202b1779e4cc223b603e589b38196cd2c793a03a8bb0ba128cc66256b35a58c5e7bb358475206
@sipa sipa mentioned this pull request Dec 5, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants