[Scummvm-git-logs] scummvm master -> a2a985368cf202bfd8ed16d0defa4c9e4ea2d328

[criezy]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8e6cc9f777 GIT: Ignore files generated by testbed engine
a2a985368c BUILD: Tie the SDL_net version to the SDL version


Commit: 8e6cc9f777742b8c84d4a8e7a45b132115b146ee
    https://github.com/scummvm/scummvm/commit/8e6cc9f777742b8c84d4a8e7a45b132115b146ee
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-09-03T23:07:21+01:00

Commit Message:
GIT: Ignore files generated by testbed engine

Changed paths:
    .gitignore



diff --git a/.gitignore b/.gitignore
index faec15b..0daf22b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -97,6 +97,10 @@ project.xcworkspace
 /dists/msvc*/*.dll
 /dists/msvc*/test_runner.cpp
 
+/dists/engine-data/testbed-audiocd-files/testbed.config
+/dists/engine-data/testbed-audiocd-files/testbed.out
+
+
 /doc/*.aux
 /doc/*.dvi
 /doc/*.log


Commit: a2a985368cf202bfd8ed16d0defa4c9e4ea2d328
    https://github.com/scummvm/scummvm/commit/a2a985368cf202bfd8ed16d0defa4c9e4ea2d328
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-09-03T23:07:21+01:00

Commit Message:
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.

Changed paths:
    backends/networking/sdl_net/client.cpp
    backends/networking/sdl_net/localwebserver.cpp
    backends/platform/sdl/sdl.cpp
    configure



diff --git a/backends/networking/sdl_net/client.cpp b/backends/networking/sdl_net/client.cpp
index 7872e56..fbb5fad 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 e85060e..fdc89b5 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
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 6862bb3..18f2a49 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -61,12 +61,11 @@
 #endif
 
 #ifdef USE_SDL_NET
-#include <SDL/SDL_net.h>
+#include <SDL_net.h>
 #endif
 
 #if SDL_VERSION_ATLEAST(2, 0, 0)
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_clipboard.h>
+#include <SDL_clipboard.h>
 #endif
 
 OSystem_SDL::OSystem_SDL()
diff --git a/configure b/configure
index 905a6d2..2f4ed0b 100755
--- a/configure
+++ b/configure
@@ -3355,10 +3355,30 @@ case $_backend in
 		case $_sdlversion in
 			2.0.*)
 				add_line_to_config_mk "USE_SDL2 = 1"
+				append_var SDL_NET_LIBS "-lSDL2_net"
 				;;
 			*)
+				append_var SDL_NET_LIBS "-lSDL_net"
 				;;
 		esac
+
+		# Check for SDL_Net
+		echocheck "SDL_Net"
+		if test "$_sdlnet" = auto ; then
+			_sdlnet=no
+			cat > $TMPC << EOF
+#include "SDL_net.h"
+int main(int argc, char *argv[]) { SDLNet_Init(); return 0; }
+EOF
+			cc_check $LIBS $INCLUDES $SDL_NET_CFLAGS $SDL_NET_LIBS && _sdlnet=yes
+		fi
+		if test "$_sdlnet" = yes ; then
+			append_var LIBS "$SDL_NET_LIBS"
+			append_var INCLUDES "$SDL_NET_CFLAGS"
+		fi
+		define_in_config_if_yes "$_sdlnet" 'USE_SDL_NET'
+		echo "$_sdlnet"
+		
 		;;
 esac
 
@@ -4135,25 +4155,6 @@ EOF
 esac
 
 #
-# Check for SDL_Net
-#
-echocheck "SDL_Net"
-if test "$_sdlnet" = auto ; then
-	_sdlnet=no
-	cat > $TMPC << EOF
-#include "SDL/SDL_net.h"
-int main(int argc, char *argv[]) { SDLNet_Init(); return 0; }
-EOF
-	cc_check $LIBS $INCLUDES $SDL_NET_CFLAGS $SDL_NET_LIBS -lSDL_net && _sdlnet=yes
-fi
-if test "$_sdlnet" = yes ; then
-	append_var LIBS "$SDL_NET_LIBS -lSDL_net"
-	append_var INCLUDES "$SDL_NET_CFLAGS"
-fi
-define_in_config_if_yes "$_sdlnet" 'USE_SDL_NET'
-echo "$_sdlnet"
-
-#
 # Check for libcurl to be present
 #
 if test "$_libcurl" != "no"; then