diff --git a/libs/windows/include/SDL_assert.h b/libs/windows/include/SDL_assert.h
index 05823713..b1355b31 100644
--- a/libs/windows/include/SDL_assert.h
+++ b/libs/windows/include/SDL_assert.h
@@ -53,8 +53,10 @@ assert can have unique static variables associated with it.
     #define SDL_TriggerBreakpoint() __debugbreak()
 #elif ( (!defined(__NACL__)) && ((defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__))) )
     #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "int $3\n\t" )
-#elif ( defined(__APPLE__) && defined(__arm64__) )  /* this might work on other ARM targets, but this is a known quantity... */
+#elif ( defined(__APPLE__) && (defined(__arm64__) || defined(__aarch64__)) )  /* this might work on other ARM targets, but this is a known quantity... */
     #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "brk #22\n\t" )
+#elif defined(__APPLE__) && defined(__arm__)
+    #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "bkpt #22\n\t" )
 #elif defined(__386__) && defined(__WATCOMC__)
     #define SDL_TriggerBreakpoint() { _asm { int 0x03 } }
 #elif defined(HAVE_SIGNAL_H) && !defined(__WATCOMC__)
diff --git a/libs/windows/include/SDL_syswm.h b/libs/windows/include/SDL_syswm.h
index 6dae3778..ee3705de 100644
--- a/libs/windows/include/SDL_syswm.h
+++ b/libs/windows/include/SDL_syswm.h
@@ -274,9 +274,10 @@ struct SDL_SysWMinfo
 #if defined(SDL_VIDEO_DRIVER_WAYLAND)
         struct
         {
-            struct wl_display *display;            /**< Wayland display */
-            struct wl_surface *surface;            /**< Wayland surface */
+            struct wl_display *display;             /**< Wayland display */
+            struct wl_surface *surface;             /**< Wayland surface */
             struct wl_shell_surface *shell_surface; /**< Wayland shell_surface (window manager handle) */
+            struct wl_egl_window *egl_window;       /**< Wayland EGL window (native window) */
         } wl;
 #endif
 #if defined(SDL_VIDEO_DRIVER_MIR)  /* no longer available, left for API/ABI compatibility. Remove in 2.1! */
diff --git a/libs/windows/lib/arm64/SDL2.dll b/libs/windows/lib/arm64/SDL2.dll
index 1964fe33..6dad4374 100644
Binary files a/libs/windows/lib/arm64/SDL2.dll and b/libs/windows/lib/arm64/SDL2.dll differ
diff --git a/libs/windows/lib/arm64/SDL2.lib b/libs/windows/lib/arm64/SDL2.lib
index 723071f8..5e8d56f8 100644
Binary files a/libs/windows/lib/arm64/SDL2.lib and b/libs/windows/lib/arm64/SDL2.lib differ
diff --git a/libs/windows/lib/arm64/SDL2.pdb b/libs/windows/lib/arm64/SDL2.pdb
index e295e5a9..1c166423 100644
Binary files a/libs/windows/lib/arm64/SDL2.pdb and b/libs/windows/lib/arm64/SDL2.pdb differ
diff --git a/libs/windows/lib/x64/SDL2.dll b/libs/windows/lib/x64/SDL2.dll
index 1fa5a555..7a3ca372 100644
Binary files a/libs/windows/lib/x64/SDL2.dll and b/libs/windows/lib/x64/SDL2.dll differ
diff --git a/libs/windows/lib/x64/SDL2.lib b/libs/windows/lib/x64/SDL2.lib
index 29e0df24..19612efe 100644
Binary files a/libs/windows/lib/x64/SDL2.lib and b/libs/windows/lib/x64/SDL2.lib differ
diff --git a/libs/windows/lib/x64/SDL2.pdb b/libs/windows/lib/x64/SDL2.pdb
index cadf11e1..b3d0a0b1 100644
Binary files a/libs/windows/lib/x64/SDL2.pdb and b/libs/windows/lib/x64/SDL2.pdb differ
diff --git a/libs/windows/lib/x86/SDL2.dll b/libs/windows/lib/x86/SDL2.dll
index 291b2f29..eb5ac969 100644
Binary files a/libs/windows/lib/x86/SDL2.dll and b/libs/windows/lib/x86/SDL2.dll differ
diff --git a/libs/windows/lib/x86/SDL2.lib b/libs/windows/lib/x86/SDL2.lib
index dd18efca..78bd13be 100644
Binary files a/libs/windows/lib/x86/SDL2.lib and b/libs/windows/lib/x86/SDL2.lib differ
diff --git a/libs/windows/lib/x86/SDL2.pdb b/libs/windows/lib/x86/SDL2.pdb
index f921de18..dc8489f0 100644
Binary files a/libs/windows/lib/x86/SDL2.pdb and b/libs/windows/lib/x86/SDL2.pdb differ