Make macOS SDL build portable, build script runnable locally #1393
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
jcm93
force-pushed
the
sdllocal
branch
2 times, most recently
from
cd00b2c to
b6a3810
Compare
|
Noticed an issue with this while fixing something else (was linking SDL even if |
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.
Resubmission of #1389 with improvements.
Now the SDL build script will not call
xcode-select, which can have undesired effects on the user build environment, unless it is on CI (detected with the$GITHUB_ACTIONSenv var).It will also not call
cmake --install ., which would previously replace the user's SDL installation.This second change required some minor changes to ruby's makefile. We now include the header directory from the cloned SDL source, and inform the linker correctly of the location of the SDL .dylib.
Also added the cloned SDL repository and .dylib to the .gitignore for easier development workflow.
To ensure compatibility with #1390, the
MACOS_COMPILED_SDLflag is added so we can include the proper "SDL.h" header for compiled builds and<SDL2/SDL.h>header for system builds.