From a2a985368cf202bfd8ed16d0defa4c9e4ea2d328 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Sat, 3 Sep 2016 23:06:42 +0100 Subject: BUILD: Tie the SDL_net version to the SDL version This means that when using SDL 1.2 we use SDL_net 1.2, but when using SDL 2 we now use SLD_net 2 as well. Both versions work properly and there is not code change needed in ScummVM. This change is because SDL_net depends on SDL, and using SDL_net 1.2 with SDL 2 means we can end up needing to link with both the SDL and SDL2 libraries. --- backends/platform/sdl/sdl.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'backends/platform') diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index 6862bb349f..18f2a49bdd 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -61,12 +61,11 @@ #endif #ifdef USE_SDL_NET -#include +#include #endif #if SDL_VERSION_ATLEAST(2, 0, 0) -#include -#include +#include #endif OSystem_SDL::OSystem_SDL() -- cgit v1.2.3