diff options
| author | nikolas <nikolas@gnu.org> | 2019-09-19 11:18:50 -0400 |
|---|---|---|
| committer | Niels Martin Hansen <nielsm@indvikleren.dk> | 2019-09-19 17:18:50 +0200 |
| commit | 2d27e8e6856cc7488842b01a271f57ae4bd07230 (patch) | |
| tree | 036adc93e7a0ad9719e81a463bc6c8eade22ea8a /src/crashlog.cpp | |
| parent | b18a58d5e1ac0fe2382e14badf80394b7e5a07b3 (diff) | |
| download | openttd-2d27e8e6856cc7488842b01a271f57ae4bd07230.tar.xz | |
Add #6173: New SDL 2 based video and sound drivers (#7086)
Diffstat (limited to 'src/crashlog.cpp')
| -rw-r--r-- | src/crashlog.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/crashlog.cpp b/src/crashlog.cpp index bcad5e35f..b56c18e8f 100644 --- a/src/crashlog.cpp +++ b/src/crashlog.cpp @@ -61,9 +61,9 @@ #ifdef WITH_LZO #include <lzo/lzo1x.h> #endif -#ifdef WITH_SDL +#if defined(WITH_SDL) || defined(WITH_SDL2) # include <SDL.h> -#endif /* WITH_SDL */ +#endif /* WITH_SDL || WITH_SDL2 */ #ifdef WITH_ZLIB # include <zlib.h> #endif @@ -267,9 +267,13 @@ char *CrashLog::LogLibraries(char *buffer, const char *last) const #endif /* WITH_PNG */ #ifdef WITH_SDL - const SDL_version *v = SDL_Linked_Version(); - buffer += seprintf(buffer, last, " SDL: %d.%d.%d\n", v->major, v->minor, v->patch); -#endif /* WITH_SDL */ + const SDL_version *sdl_v = SDL_Linked_Version(); + buffer += seprintf(buffer, last, " SDL1: %d.%d.%d\n", sdl_v->major, sdl_v->minor, sdl_v->patch); +#elif defined(WITH_SDL2) + SDL_version sdl2_v; + SDL_GetVersion(&sdl2_v); + buffer += seprintf(buffer, last, " SDL2: %d.%d.%d\n", sdl2_v.major, sdl2_v.minor, sdl2_v.patch); +#endif #ifdef WITH_ZLIB buffer += seprintf(buffer, last, " Zlib: %s\n", zlibVersion()); |