aboutsummaryrefslogtreecommitdiff
path: root/backends/networking
diff options
context:
space:
mode:
authorThierry Crozat2016-09-03 23:06:42 +0100
committerThierry Crozat2016-09-03 23:07:21 +0100
commita2a985368cf202bfd8ed16d0defa4c9e4ea2d328 (patch)
tree87ff2fa2c16681d34ca18f88691c363f5f0dfcc5 /backends/networking
parent8e6cc9f777742b8c84d4a8e7a45b132115b146ee (diff)
downloadscummvm-rg350-a2a985368cf202bfd8ed16d0defa4c9e4ea2d328.tar.gz
scummvm-rg350-a2a985368cf202bfd8ed16d0defa4c9e4ea2d328.tar.bz2
scummvm-rg350-a2a985368cf202bfd8ed16d0defa4c9e4ea2d328.zip
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.
Diffstat (limited to 'backends/networking')
-rw-r--r--backends/networking/sdl_net/client.cpp2
-rw-r--r--backends/networking/sdl_net/localwebserver.cpp2
2 files changed, 2 insertions, 2 deletions
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 <SDL/SDL_net.h>
+#include <SDL_net.h>
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 <SDL/SDL_net.h>
+#include <SDL_net.h>
#include <common/config-manager.h>
#ifdef POSIX