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.

Sign up for GitHub

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

Jump to bottom

Attempt to fix missing SDL.h with VCPKG builds #1827

Merged
merged 2 commits into from
Oct 7, 2021
Merged

Attempt to fix missing SDL.h with VCPKG builds #1827

merged 2 commits into from
Oct 7, 2021

Conversation

Semphriss
Copy link
Member

No description provided.

@Semphriss Semphriss marked this pull request as draft September 24, 2021 21:49
@Rusty-Box Rusty-Box added os:windows priority:high status:in-progress Progress has been done, but more is intended be done labels Sep 30, 2021
@tobbi
Copy link
Member

tobbi commented Oct 7, 2021

Upstream discussion with the guys from Github actions: actions/runner-images#4235

@tobbi
Copy link
Member

tobbi commented Oct 7, 2021

@Grumbel

Do you not need to pass the new "TINYGETTEXT_SDL2_INCLUDE_DIRS" variable to the subproject?

Also, don't have the previous changes be reverted?

Why did this show up so suddenly? Is a recent change in cmake responsible for the breakage?

@Grumbel Grumbel force-pushed the vcpkg-fix branch 2 times, most recently from e0535eb to bc6ab55 Compare October 7, 2021 18:43
@Grumbel
Fix SDL2_INCLUDE_DIRS truncation when passed to tinygettext
0e47fad 
CMake lists are just strings with ';' separators, thus passing lists
of lists is impossible. ExternalProject_Add provides LIST_SEPARATOR to
work around this limitations by using a different separator.
@Grumbel
Copy link
Member

Grumbel commented Oct 7, 2021

Do you not need to pass the new "TINYGETTEXT_SDL2_INCLUDE_DIRS" variable to the subproject?

Yes.

Also, don't have the previous changes be reverted?

Semphriss first one was still necessary, as there was unnecessary code that added an extra 'SDL2' to the path and that would still make the build fail, though I only realized that after having dropped it already.

Why did this show up so suddenly? Is a recent change in cmake responsible for the breakage?

Some change in vcpkg or SDL I would assume (25382e39f7bf93e1d501d9342c6845e7bb0d2574 maybe, update to SDL 2.0.16), though really the fault is in SuperTux.

@tobbi tobbi marked this pull request as ready for review October 7, 2021 20:32
@tobbi tobbi merged commit 3681028 into master Oct 7, 2021
@Grumbel Grumbel deleted the vcpkg-fix branch October 8, 2021 15:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
os:windows priority:high status:in-progress Progress has been done, but more is intended be done
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Semphriss @tobbi @Grumbel @Rusty-Box