Fixed CMake FindOpenGL script for GLES, fixed a few things and added a build check for Android #728
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
kblaschke
force-pushed
the
fix-cmake-find-gles-script
branch
from
0bffa16 to
70132f1
Compare
Blaquewithaq
approved these changes
Sep 20, 2023
revmischa
approved these changes
Sep 20, 2023
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.
The findOpenGL script still tried to find/require desktop GL libraries when requesting any GLES implementation. We now only search for GLES if it's requested, as mixing both really makes no sense.
Also added a check for Android in
CMAKE_SYSTEM_NAME, forcibly enabling GLES3 if this is found. To not break Android builds in the future, I've also added an Actions build check which builds libprojectM via the NDK for Android, arm64-v8a and API level 33. The resulting artifacts should then be useable by any Android dev targeting the same API level.