-
-
Notifications
You must be signed in to change notification settings - Fork 177
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 https://github.com/Level/leveldown/issues/196 #235
Conversation
+1 @No9 You're the go to guy when it comes to windows :) |
@@ -26,9 +26,13 @@ | |||
] | |||
, 'conditions': [ | |||
['OS == "win"', { | |||
'conditions': [ | |||
['MSVS_VERSION != "2015" and MSVS_VERSION != "2013"', { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can test it tomorrow but won't this break on 2013 as that version needs the 'port/win' folder?
Also does this now mandate that the --msvs_version
has to be passed as part of the build?
If so this will cause issues with down stream libs that depend on this and we should at least have to warn the user that --msvc_version
is mandatory on windows somewhere in the output?
@obastemur I also noted here #213 (comment) that there is a patch to go into /deps/leveldb/port-libuv/port_uv.h
Did you come across that?
Thanks for trying to land this in as I couldn't come up we an alternative to the --msvs_version
approach when I looked at this back in September so we might just have to take the hit
It also looks like this commit 29282aa from @appelgriebsch is trying to fix the same issue. I seem to remember that the approach in that commit of remming out stdint.h still caused issues on 2015 as the 2015 build defaulted to that file hence the need to ignore it as outlined by @obastemur here.
So I think the steps are
- Rollback https://github.com/Level/leveldown/blob/29282aa1de6917da110b116feee4c28f879435a7/deps/leveldb/leveldb-1.18.0/port/win/stdint.h but keep https://github.com/Level/leveldown/blob/29282aa1de6917da110b116feee4c28f879435a7/deps/leveldb/port-libuv/port_uv.h
- Confirm the
MSVS_VERSION != "2013"
test in this patch - Decide if we are going to take the hit of the build option
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also does this now mandate that the --msvs_version has to be passed as part of the build?
No. MSVS_VERSION
is defined by gyp based on whatever version of VS is selected by gyp etc..
@obastemur I also noted here #213 (comment) that there is a patch to go into /deps/leveldb/port-libuv/port_uv.h
Did you come across that?
Actually I've changed a lot for UWP / VS2015 (see Level/leveldown-mobile) but the original issue is just because of stdint.h
so the rest (if there is any) might be subject to another PR.
It also looks like this commit 29282aa from @appelgriebsch is trying to fix the same issue.
IMHO that's not a solution. (shadowing stdint.h)
I've confirmed VS2013. (Don't know VS2012 so didn't add here)
OK @obastemur |
@ralphtheninja do you want to do the honours with the merge |
@No9 Thanks :) |
Nope! I want you do do it :) |
Fixes #196 and is my first merge into core :)
No description provided.