Rebased 251: Fixed Windows build breaks #264
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
Make ws2_32.lib linkage conditionally.
|
I'm going to merge this after we get a green CI checkmark. I've reviewed the original #251. |
|
Thanks again @seanyen for the PR. |
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.
Rebased version of #251 which makes
simple_messageandindustrial_robot_clientet al. build on Windows.Tested against Roboguide with
fanuc_driveron Ubuntu. No regressions detected. Tests still pass.I haven't been able to test this on Windows, as I don't have access to a suitable Windows installation.
I trust @seanyen has though, and #251 (comment) reports another success by an additional user.