Browse Source

Fixes for Android builds

Vladyslav Serhiienko 2 years ago
parent
commit
47deebe23f
2 changed files with 4 additions and 0 deletions
  1. 3 0
      include/SDL3/SDL_assert.h
  2. 1 0
      src/video/android/SDL_androidvideo.c

+ 3 - 0
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 */
 /* Don't include intrin.h here because it contains C++ code */
     extern void __cdecl __debugbreak(void);
     extern void __cdecl __debugbreak(void);
     #define SDL_TriggerBreakpoint() __debugbreak()
     #define SDL_TriggerBreakpoint() __debugbreak()
+#elif defined(ANDROID)
+    #include <assert.h>
+    #define SDL_TriggerBreakpoint() assert(0)
 #elif SDL_HAS_BUILTIN(__builtin_debugtrap)
 #elif SDL_HAS_BUILTIN(__builtin_debugtrap)
     #define SDL_TriggerBreakpoint() __builtin_debugtrap()
     #define SDL_TriggerBreakpoint() __builtin_debugtrap()
 #elif (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__))
 #elif (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__))

+ 1 - 0
src/video/android/SDL_androidvideo.c

@@ -293,6 +293,7 @@ void Android_SendResize(SDL_Window *window)
         int w, h;
         int w, h;
         SDL_VideoDisplay *display = SDL_GetVideoDisplayForWindow(window);
         SDL_VideoDisplay *display = SDL_GetVideoDisplayForWindow(window);
         SDL_DisplayMode current_mode;
         SDL_DisplayMode current_mode;
+        SDL_zero(current_mode);
 
 
         current_mode.format = Android_ScreenFormat;
         current_mode.format = Android_ScreenFormat;
         current_mode.pixel_w = Android_DeviceWidth;
         current_mode.pixel_w = Android_DeviceWidth;