Change #6173: Update SDL driver to use SDL 2.0

OpenTTD · Jan 23, 2019 · 0a9d162 · 0a9d162
1 parent ed325ad
commit 0a9d162
Show file tree

Hide file tree

Showing 5 changed files with 218 additions and 146 deletions.
diff --git a/config.lib b/config.lib
@@ -2500,7 +2500,7 @@ detect_sdl() {
 		sleep 5
 	fi
 
-	detect_pkg_config "$with_sdl" "sdl" "sdl_config" "1.2"
+	detect_pkg_config "$with_sdl" "sdl2" "sdl_config" "2.0"
 }
 
 detect_osx_sdk() {

diff --git a/src/crashlog.cpp b/src/crashlog.cpp
@@ -269,12 +269,15 @@ char *CrashLog::LogLibraries(char *buffer, const char *last) const
 
 #ifdef WITH_SDL
 #ifdef DYNAMICALLY_LOADED_SDL
-	if (SDL_CALL SDL_Linked_Version != NULL) {
+	SDL_version linked;
+	SDL_CALL SDL_GetVersion(&linked);
+	if (linked != NULL) {
 #else
 	{
 #endif
-		const SDL_version *v = SDL_CALL SDL_Linked_Version();
-		buffer += seprintf(buffer, last, " SDL:        %d.%d.%d\n", v->major, v->minor, v->patch);
+		SDL_version v;
+		SDL_CALL SDL_GetVersion(&v);
+		buffer += seprintf(buffer, last, " SDL:        %d.%d.%d\n", v.major, v.minor, v.patch);
 	}
 #endif /* WITH_SDL */
 

diff --git a/src/sdl.cpp b/src/sdl.cpp
@@ -94,7 +94,7 @@ const char *SdlOpen(uint32 x)
 	}
 #endif
 	if (_sdl_usage++ == 0) {
-		if (SDL_CALL SDL_Init(x | SDL_INIT_NOPARACHUTE) == -1) return SDL_CALL SDL_GetError();
+		if (SDL_CALL SDL_Init(x) == -1) return SDL_CALL SDL_GetError();
 	} else if (x != 0) {
 		if (SDL_CALL SDL_InitSubSystem(x) == -1) return SDL_CALL SDL_GetError();
 	}