Update macOS SDL to Hg a5b970d28bfd

This commit is contained in:
Cameron Gutman 2021-01-17 10:08:45 -06:00
parent 724dcb557f
commit e210dc748f
5 changed files with 11 additions and 8 deletions

View File

@ -53,8 +53,10 @@ assert can have unique static variables associated with it.
#define SDL_TriggerBreakpoint() __debugbreak() #define SDL_TriggerBreakpoint() __debugbreak()
#elif ( (!defined(__NACL__)) && ((defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__))) ) #elif ( (!defined(__NACL__)) && ((defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__))) )
#define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "int $3\n\t" ) #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" ) #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__) #elif defined(__386__) && defined(__WATCOMC__)
#define SDL_TriggerBreakpoint() { _asm { int 0x03 } } #define SDL_TriggerBreakpoint() { _asm { int 0x03 } }
#elif defined(HAVE_SIGNAL_H) && !defined(__WATCOMC__) #elif defined(HAVE_SIGNAL_H) && !defined(__WATCOMC__)

View File

@ -274,9 +274,10 @@ struct SDL_SysWMinfo
#if defined(SDL_VIDEO_DRIVER_WAYLAND) #if defined(SDL_VIDEO_DRIVER_WAYLAND)
struct struct
{ {
struct wl_display *display; /**< Wayland display */ struct wl_display *display; /**< Wayland display */
struct wl_surface *surface; /**< Wayland surface */ struct wl_surface *surface; /**< Wayland surface */
struct wl_shell_surface *shell_surface; /**< Wayland shell_surface (window manager handle) */ struct wl_shell_surface *shell_surface; /**< Wayland shell_surface (window manager handle) */
struct wl_egl_window *egl_window; /**< Wayland EGL window (native window) */
} wl; } wl;
#endif #endif
#if defined(SDL_VIDEO_DRIVER_MIR) /* no longer available, left for API/ABI compatibility. Remove in 2.1! */ #if defined(SDL_VIDEO_DRIVER_MIR) /* no longer available, left for API/ABI compatibility. Remove in 2.1! */

View File

@ -27,7 +27,7 @@
<dict> <dict>
<key>cdhash</key> <key>cdhash</key>
<data> <data>
c8f8dm7+lXdq/Z6WbkTx/1+k5c8= PhgHozinkAzD8nahJaBZ1/oJU2g=
</data> </data>
<key>requirement</key> <key>requirement</key>
<string>identifier "org.libsdl.hidapi" and anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "45U78722YL"</string> <string>identifier "org.libsdl.hidapi" and anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "45U78722YL"</string>
@ -47,11 +47,11 @@
<dict> <dict>
<key>hash</key> <key>hash</key>
<data> <data>
IiADcTyPo9pVBYrpKHU6mFN50e8= 1DPiXYesyNHEpDx6O6DAQtDDVpM=
</data> </data>
<key>hash2</key> <key>hash2</key>
<data> <data>
cJ9XWwjjAF41qBQKxApkxGOIALw175pk2GwNunz1wpg= RivNhNmxSfSv5F3G6U6zXGpL03d7McfcUPOziuiwl9o=
</data> </data>
</dict> </dict>
<key>Headers/SDL_atomic.h</key> <key>Headers/SDL_atomic.h</key>
@ -630,11 +630,11 @@
<dict> <dict>
<key>hash</key> <key>hash</key>
<data> <data>
tx2N4ZBojH9icPrioVFxJSC3PqU= SRx/vJZF0gB/BMNwqk99jiFOzv0=
</data> </data>
<key>hash2</key> <key>hash2</key>
<data> <data>
+euT3aTdjRQw3Mn13gwrNYGNyl9MJjWvVSxHqJuQGm0= /1aFRHr+7TVJ57vEMAOl6EtytMgiUb0ZN50zJD11gZo=
</data> </data>
</dict> </dict>
<key>Headers/SDL_thread.h</key> <key>Headers/SDL_thread.h</key>