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/networking/sdl_net/client.cpp | 2 +- backends/networking/sdl_net/localwebserver.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'backends/networking/sdl_net') diff --git a/backends/networking/sdl_net/client.cpp b/backends/networking/sdl_net/client.cpp index 7872e56ae7..fbb5fadf35 100644 --- a/backends/networking/sdl_net/client.cpp +++ b/backends/networking/sdl_net/client.cpp @@ -25,7 +25,7 @@ #include "backends/networking/sdl_net/client.h" #include "backends/networking/sdl_net/localwebserver.h" #include "common/memstream.h" -#include +#include namespace Networking { diff --git a/backends/networking/sdl_net/localwebserver.cpp b/backends/networking/sdl_net/localwebserver.cpp index e85060e9fb..fdc89b51e4 100644 --- a/backends/networking/sdl_net/localwebserver.cpp +++ b/backends/networking/sdl_net/localwebserver.cpp @@ -29,7 +29,7 @@ #include "common/system.h" #include "common/timer.h" #include "common/translation.h" -#include +#include #include #ifdef POSIX -- cgit v1.2.3