From 47deebe23fe08be99a297f35fdcb4289c969adc1 Mon Sep 17 00:00:00 2001 From: Vladyslav Serhiienko Date: Mon, 30 Jan 2023 22:59:48 -0800 Subject: [PATCH] Fixes for Android builds --- include/SDL3/SDL_assert.h | 3 +++ src/video/android/SDL_androidvideo.c | 1 + 2 files changed, 4 insertions(+) diff --git a/include/SDL3/SDL_assert.h b/include/SDL3/SDL_assert.h index 6791972778..ad3eb8c865 100644 --- a/include/SDL3/SDL_assert.h +++ b/include/SDL3/SDL_assert.h @@ -51,6 +51,9 @@ assert can have unique static variables associated with it. /* Don't include intrin.h here because it contains C++ code */ extern void __cdecl __debugbreak(void); #define SDL_TriggerBreakpoint() __debugbreak() +#elif defined(ANDROID) + #include + #define SDL_TriggerBreakpoint() assert(0) #elif SDL_HAS_BUILTIN(__builtin_debugtrap) #define SDL_TriggerBreakpoint() __builtin_debugtrap() #elif (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__)) diff --git a/src/video/android/SDL_androidvideo.c b/src/video/android/SDL_androidvideo.c index 8eee45297b..59bd393738 100644 --- a/src/video/android/SDL_androidvideo.c +++ b/src/video/android/SDL_androidvideo.c @@ -293,6 +293,7 @@ void Android_SendResize(SDL_Window *window) int w, h; SDL_VideoDisplay *display = SDL_GetVideoDisplayForWindow(window); SDL_DisplayMode current_mode; + SDL_zero(current_mode); current_mode.format = Android_ScreenFormat; current_mode.pixel_w = Android_DeviceWidth;