Update to latest SDL for macOS/Windows builds #783
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It's an empty library on macOS anyway
All we needed to do was specify where they were...
The frameworks now have a cmake config
There is one now
This will allow using find_package
We now find them where they're extracted
VS is going through the config path now
The old check was used for the macOS framework workaround, which was removed. This check should allow including a local copy of SDL2
I don't think anyone is using the android support, and this requires manually prebuilding the libs multiple times. Instead, you can include SDL in a subdir (add_subdirectory) or use FetchContent. (Now that we have the right checks)
|
Awesome stuff, thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This started as an attempt to work around build failures on macOS, then turned into "I wonder if I can clean this up by updating"... and then resulted in android boilerplate for some reason.
First three are fixes and could be split if we just want fixes for now. Then, macOS/Windows (VS+MinGW) SDL versions are updated which allows some simplification as they both support
find_packagenow.There's some cleanup to make macOS frameworks slightly less special, the VS script doesn't create two copies of the headers/libs and the MinGW script no longer needs to patch the config.
2c89fb1 and 96a175f allow including SDL sources before the SDK, which is handy for platforms that don't have a prebuilt version available.
Oh, and I actually updated the docs this time. (Fixing the SDL download links as well)
(Probably replaces #483)