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

Fix #8800: Compilation with OPTION_DEDICATED=ON #8802

Merged
merged 3 commits into from Mar 4, 2021
Merged

Conversation

glx22
Copy link
Contributor

@glx22 glx22 commented Mar 3, 2021

Fixes #8800

Motivation / Problem

Building with OPTION_DEDICATED=ON included unneeded source files, causing link errors.
Files inclusion happened because libs were always detected before being ignored as unneeded for dedicated server.

Description

First I added a CI target so we always check compilation with OPTION_DEDICATED=ON (to not break it again without noticing).
Then I reworked the library detection to skip unneeded ones for OPTION_DEDICATED=ON.
Finally regression test failed because dedicated builds add a timestamp to each debug line, so regression result is now cleaned of these timestamps before the comparison with expected output.

Limitations

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')
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, gs_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

@glx22 glx22 merged commit 349dc56 into OpenTTD:master Mar 4, 2021
11 checks passed
@glx22 glx22 deleted the dedicated branch Mar 4, 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.

2 participants