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 for Haiku #9285

Merged
merged 3 commits into from May 24, 2021
Merged

Fixes for Haiku #9285

merged 3 commits into from May 24, 2021

Conversation

Milek7
Copy link
Contributor

@Milek7 Milek7 commented May 20, 2021

Motivation / Problem

It was failing to compile on Haiku.

Description

Fix building flags and add workarounds for Haiku bemidi and sockets implementation.
Tested with SDL1.

Limitations

I removed old network code for BeOS, but that's kind of moot point given that it requires gcc 2.95 and surely C++17 won't compile on it anyway.

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')

@Milek7 Milek7 changed the title Some fixes for Haiku Fixes for Haiku May 20, 2021
LordAro
LordAro previously approved these changes May 21, 2021
Copy link
Member

@LordAro LordAro left a comment

Choose a reason for hiding this comment

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

Fine by me

src/music/bemidi.cpp Outdated Show resolved Hide resolved
@rubidium42 rubidium42 added the backport requested This PR should be backport to current release (RC / stable) label May 23, 2021
@rubidium42 rubidium42 merged commit 7607277 into OpenTTD:master May 24, 2021
@TrueBrain TrueBrain removed the backport requested This PR should be backport to current release (RC / stable) label Oct 3, 2021
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.

None yet

4 participants