fix apothecary compiled 32bit libs for openssl #4009
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
opensslconf_vs was broken for 32 bit vs builds. This commit adds the updated libraries and header file for vs. opensslconf_vs.h originally also included an absolute path on Dominic's machine. This should fix it. Tested on 32 and 64 bit.
arturoc
added a commit
that referenced
this pull request
Jun 28, 2015
fix apothecary compiled 32bit libs for openssl
6 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
opensslconf_vs broke 32 bit vs builds. This commit adds the updated 32 bit static libraries and header file for vs. The libraries (and header) were generated through apothecary.
opensslconf_vs.h originally appeared to include an absolute path on Dominic's machine (line 111). Although this should have no effect, i believe its safer to change it back to the apothecary generated default.
Tested on VS2015RC 32 and 64 bit.