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

Add checks to qmake for wayland/x11 #234

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

loonycyborg
Copy link
Contributor

This makes surface page appear for me with my usual way of building with qmake/make without having to pass any extra defines to it.

@SaschaWillems
Copy link
Owner

Before merging this: Will this still work with CI?

@loonycyborg
Copy link
Contributor Author

I did add pkg-config check that was needed to address systems that don't have wayland client development files installed. Seems CI for PR did pass too.

@SaschaWillems
Copy link
Owner

Right now I use defines to build wayland/x11 versions, see e.g. https://github.com/SaschaWillems/VulkanCapsViewer/blob/master/.github/workflows/build.yml#L38

And I'm unsure if this PR won't break my CI builds by creating applications that seemingly compile and build but fail at runtime.

@loonycyborg
Copy link
Contributor Author

Only testing can tell for sure but CI doesn't seem to make artifacts available. Theoretically both pre-pr and post-pr builds should match with the exception of wayland build that would have x11 codepath also included. Due to PR #233 wayland will still be preferred in that case.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants