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

Committing local fixes and changes I had. #31

Merged
merged 2 commits into from
Apr 17, 2024

Conversation

kevinbentley
Copy link
Member

No description provided.

@SiriusTR
Copy link

Regarding the Windows build failures - these seem to come from CMake not finding SDL - I notice we have an extra step to install it for Mac already in .github/workflows/build.yml so maybe this needs to happen on Windows too now. Unfortunately, I'm not familiar with the GitHub Actions API so I don't know how you'd go about doing that.

Choose a reason for hiding this comment

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

This change is a bit odd - as discussed on Discord it looks like it might cause a crash.

@Arcnor
Copy link
Collaborator

Arcnor commented Apr 17, 2024

If we don't mind having vcpkg as a package manager, it's just a line or two to get SDL or basically any other supported package.

Otherwise there are GH actions to get SDL.

@Arcnor
Copy link
Collaborator

Arcnor commented Apr 17, 2024

It seems the SDL dependency is not needed on Windows yet (and the sdl2_image is not needed anywhere AFAIK), so it can just be removed from the Windows section on the CMakeLists and this PR will compile properly.

That said I've been working on adding vcpkg support and it already works fine, but currently there is no point until SDL2 is a requirement. I'll bring that up again after Ryan's Linux/Mac port is added, or that's rejected and a SDL2 port is started.

@Arcnor Arcnor merged commit cb8bd1e into DescentDevelopers:main Apr 17, 2024
4 of 5 checks passed
JeodC pushed a commit that referenced this pull request Apr 28, 2024
Committing local fixes and changes I had.
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

3 participants