Add SDL3 support and fix wayland issue (PR #26435)
Andy Vandijck
SDL3 support
Minor wayland fix
You can view, comment on, or merge this pull request online at:
https://github.com/wxWidgets/wxWidgets/pull/26435
Commit Summary
- aa138aa Add SDL3 support and fix wayland issue
File Changes
(7 files)
- M build/cmake/init.cmake (20)
- M build/cmake/lib/core/CMakeLists.txt (12)
- M build/cmake/setup.h.in (7)
- M configure (20207)
- M configure.ac (19)
- M setup.h.in (5)
- M src/unix/sound_sdl.cpp (128)
Patch Links:
- https://github.com/wxWidgets/wxWidgets/pull/26435.patch
- https://github.com/wxWidgets/wxWidgets/pull/26435.diff
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications on the go with GitHub Mobile for iOS or Android.
You are receiving this because you are subscribed to this thread.
VZ
@vadz commented on this pull request.
Thanks for updating the code to use SDL3, this is much appreciated!
I'd like to merge this, however I'm not sure about what the Wayland issue is and whether this is the right fix for it — maybe it should be dealt with in a separate PR?
Also, it looks configure was regenerated using a different version of autoconf, which might account for the CI build failures. Could you please follow build/tools/autoconf/README.md to update it?
> @@ -628,7 +628,7 @@
Recommended setting: 1, only set to 0 if wayland-client is not available.
*/
-#cmakedefine01 wxHAVE_WAYLAND_CLIENT
+#cmakedefine wxHAVE_WAYLAND_CLIENT 1
Could you please explain why is this needed?
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications on the go with GitHub Mobile for iOS or Android.
You are receiving this because you are subscribed to this thread.
Andy Vandijck
@andyvand commented on this pull request.
> @@ -628,7 +628,7 @@
Recommended setting: 1, only set to 0 if wayland-client is not available.
*/
-#cmakedefine01 wxHAVE_WAYLAND_CLIENT
+#cmakedefine wxHAVE_WAYLAND_CLIENT 1
It doesn't build right without this
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications on the go with GitHub Mobile for iOS or Android.
You are receiving this because you are subscribed to this thread.
VZ
@vadz commented on this pull request.
> @@ -628,7 +628,7 @@
Recommended setting: 1, only set to 0 if wayland-client is not available.
*/
-#cmakedefine01 wxHAVE_WAYLAND_CLIENT
+#cmakedefine wxHAVE_WAYLAND_CLIENT 1
Sorry, what do you mean by "right"?
In any case, maybe I should be more explicit: this change is almost certainly not correct, wxHAVE_WAYLAND_CLIENT should be set by the code in build/cmake/init.cmake and if there is something wrong with it, this should be fixed there.
But, again, let's not deal with this here, please undo this change and regenerate configure to check if this fixes the failing CI builds so that the rest of the changes could be merged.
TIA!
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications on the go with GitHub Mobile for iOS or Android.
You are receiving this because you are subscribed to this thread.
VZ
vadz left a comment (wxWidgets/wxWidgets#26435)MSW CI failures seem to be spurious, but I'm less sure about the Mac builds, it looks like something could be wrong with configure, could you please check?
Also, do we absolutely have to include SDL3 headers using #include <SDL3/SDL.h> instead of just #include <SDL.h>? If we could keep the latter, we could avoid adding wxUSE_LIBSDL3 which would be nice(r).
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications on the go with GitHub Mobile for iOS or Android.
You are receiving this because you are subscribed to this thread.