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

Always link threads, fix linking cURL #8814

Merged
merged 6 commits into from May 2, 2019

Conversation

tomlankhorst
Copy link
Contributor

@tomlankhorst tomlankhorst commented Mar 2, 2019

Threads are currently used throughout the codebase so they need to be
required. CURL is required when using HTTP, not when using Networking.

Fixes #8810

Current situation:

  • DISABLE_HTTP Disables cURL and Http.cpp.
  • DISABLE_NETWORK Disabled Network.cpp and friends.

I think it's a bit vague that disabling networking does not disable HTTP.
Maybe, we could refactor it to DISABLE_MULTIPLAYER?

@Gymnasiast
Copy link
Member

Gymnasiast commented May 2, 2019

This will need to have the changelog updated as well, but looks fine otherwise.
Never mind, it's not user-facing and nothing big either.

@IntelOrca IntelOrca merged commit 4746051 into OpenRCT2:develop May 2, 2019
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.

-DDISABLE_NETWORK=ON requires pthreads too
3 participants