Fix iPhone build broken by fbb3f0c. #1568
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
|
Are you referencing the right commit? Did you mean 74edb77? Looks good either way (I don't have an iPhone handy to test this... I wonder if we can get a iPhone CI for this). |
|
Yeah, not sure how I got the wrong commit. I had 74edb77 pulled up while I was working on the patch. |
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.
Building for iPhone was failing on
src/opengl/extensions.c. I traced the failure back to a change in commit fbb3f0c.In order to keep that workaround functioning, I changed the
#if defined ALLEGRO_MACOSX || defined __APPLE__to#if defined __APPLE__ && !defined ALLEGRO_IPHONE.This fix ensures the proper OpenGL header is included if we are building for MacOS (including the SDL port which disables the
ALLEGRO_MACOSXplatform definition) and it is not included if we are building for iPhone.