diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/Frameworks/hidapi.framework/Versions/A/hidapi b/libs/mac/Frameworks/SDL2.framework/Versions/A/Frameworks/hidapi.framework/Versions/A/hidapi index 0f3ffa45..9969235e 100755 Binary files a/libs/mac/Frameworks/SDL2.framework/Versions/A/Frameworks/hidapi.framework/Versions/A/hidapi and b/libs/mac/Frameworks/SDL2.framework/Versions/A/Frameworks/hidapi.framework/Versions/A/hidapi differ diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_assert.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_assert.h index 05823713..b1355b31 100644 --- a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_assert.h +++ b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/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/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_syswm.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_syswm.h index 6dae3778..ee3705de 100644 --- a/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_syswm.h +++ b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/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/mac/Frameworks/SDL2.framework/Versions/A/SDL2 b/libs/mac/Frameworks/SDL2.framework/Versions/A/SDL2 index 94c0213d..b5038971 100755 Binary files a/libs/mac/Frameworks/SDL2.framework/Versions/A/SDL2 and b/libs/mac/Frameworks/SDL2.framework/Versions/A/SDL2 differ diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/_CodeSignature/CodeResources b/libs/mac/Frameworks/SDL2.framework/Versions/A/_CodeSignature/CodeResources index 2e85fbb7..db88ddad 100644 --- a/libs/mac/Frameworks/SDL2.framework/Versions/A/_CodeSignature/CodeResources +++ b/libs/mac/Frameworks/SDL2.framework/Versions/A/_CodeSignature/CodeResources @@ -27,7 +27,7 @@ cdhash - c8f8dm7+lXdq/Z6WbkTx/1+k5c8= + PhgHozinkAzD8nahJaBZ1/oJU2g= requirement 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" @@ -47,11 +47,11 @@ hash - IiADcTyPo9pVBYrpKHU6mFN50e8= + 1DPiXYesyNHEpDx6O6DAQtDDVpM= hash2 - cJ9XWwjjAF41qBQKxApkxGOIALw175pk2GwNunz1wpg= + RivNhNmxSfSv5F3G6U6zXGpL03d7McfcUPOziuiwl9o= Headers/SDL_atomic.h @@ -630,11 +630,11 @@ hash - tx2N4ZBojH9icPrioVFxJSC3PqU= + SRx/vJZF0gB/BMNwqk99jiFOzv0= hash2 - +euT3aTdjRQw3Mn13gwrNYGNyl9MJjWvVSxHqJuQGm0= + /1aFRHr+7TVJ57vEMAOl6EtytMgiUb0ZN50zJD11gZo= Headers/SDL_thread.h