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

Fix compilation on Linux with SFML_OPENGL_ES option #2160

Merged
merged 1 commit into from Jun 29, 2022

Conversation

kimci86
Copy link
Contributor

@kimci86 kimci86 commented Jun 27, 2022

Description

Last night in #2157, I introduced without realizing some nonsense in the Window/CMakeLists.txt file.
I hoped CI would catch this kind of mistakes but there is no check with SFML_OPENGL_ES option enabled.

This PR makes it possible to build SFML on Linux with any combination of SFML_USE_DRM and SFML_OPENGL_ES as it was before #2157.

How to test this PR?

cmake -B build -DCMAKE_BUILD_TYPE=Debug -DWARNINGS_AS_ERRORS=False
cmake -B build -DSFML_USE_DRM=False -DSFML_OPENGL_ES=False && cmake --build build
cmake -B build -DSFML_USE_DRM=True  -DSFML_OPENGL_ES=False && cmake --build build
cmake -B build -DSFML_USE_DRM=False -DSFML_OPENGL_ES=True  && cmake --build build
cmake -B build -DSFML_USE_DRM=True  -DSFML_OPENGL_ES=True  && cmake --build build

I had to disable WARNINGS_AS_ERRORS because some OpenGL ES specific parts trigger warnings, but that is a different topic.

Tested on Ubuntu and Raspbian.

@eXpl0it3r eXpl0it3r added this to Discussion in SFML 2.6.0 via automation Jun 27, 2022
@eXpl0it3r eXpl0it3r added this to the 2.6 milestone Jun 27, 2022
@eXpl0it3r eXpl0it3r moved this from Discussion to Review & Testing in SFML 2.6.0 Jun 27, 2022
SFML 2.6.0 automation moved this from Review & Testing to Ready Jun 29, 2022
@eXpl0it3r eXpl0it3r merged commit faaec51 into SFML:2.6.x Jun 29, 2022
SFML 2.6.0 automation moved this from Ready to Done Jun 29, 2022
@eXpl0it3r
Copy link
Member

Thanks for the fix! 🙂

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
SFML 2.6.0
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

2 participants