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

[bgK]

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

Summary:
cd86de0dc2 BUILD: Fix linking the PS3 build with SDL_Net
25bf68c39a BACKENDS: Remove extra line returns in warnings
cda41d2fb4 CREATE_PROJECT: Add CURL and SDL_net to the list of libraries for cmake generation


Commit: cd86de0dc2fc6508f93f93d0262ed7505f7f3069
    https://github.com/scummvm/scummvm/commit/cd86de0dc2fc6508f93f93d0262ed7505f7f3069
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2016-09-03T07:14:16+02:00

Commit Message:
BUILD: Fix linking the PS3 build with SDL_Net

Changed paths:
    configure



diff --git a/configure b/configure
index 051c164..905a6d2 100755
--- a/configure
+++ b/configure
@@ -2604,6 +2604,8 @@ case $_host_os in
 		append_var DEFINES "-DPLAYSTATION3"
 		append_var CXXFLAGS "-mcpu=cell -mminimal-toc -I$PSL1GHT/ppu/include -I$PS3DEV/portlibs/ppu/include"
 		append_var LDFLAGS "-L$PSL1GHT/ppu/lib -L$PS3DEV/portlibs/ppu/lib"
+		# The network libraries are statically linked and need to be specified in the following order
+		append_var SDL_NET_LIBS "-lSDL_net -lnet -lsysmodule"
 		add_line_to_config_mk 'PLAYSTATION3 = 1'
 		add_line_to_config_h "#define PREFIX \"${prefix}\""
 		;;


Commit: 25bf68c39a634e001efb03b556ac9e71b12d07f8
    https://github.com/scummvm/scummvm/commit/25bf68c39a634e001efb03b556ac9e71b12d07f8
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2016-09-03T07:14:16+02:00

Commit Message:
BACKENDS: Remove extra line returns in warnings

Changed paths:
    backends/networking/sdl_net/localwebserver.cpp



diff --git a/backends/networking/sdl_net/localwebserver.cpp b/backends/networking/sdl_net/localwebserver.cpp
index 6557c7a..2b971cf 100644
--- a/backends/networking/sdl_net/localwebserver.cpp
+++ b/backends/networking/sdl_net/localwebserver.cpp
@@ -273,11 +273,11 @@ void LocalWebserver::resolveAddress(void *ipAddress) {
 	// default way (might work everywhere, surely works on Windows)
 	const char *name = SDLNet_ResolveIP(ip);
 	if (name == NULL) {
-		warning("LocalWebserver: SDLNet_ResolveHost: %s\n", SDLNet_GetError());
+		warning("LocalWebserver: SDLNet_ResolveIP: %s", SDLNet_GetError());
 	} else {
 		IPaddress localIp;
 		if (SDLNet_ResolveHost(&localIp, name, _serverPort) == -1) {
-			warning("LocalWebserver: SDLNet_ResolveHost: %s\n", SDLNet_GetError());
+			warning("LocalWebserver: SDLNet_ResolveHost: %s", SDLNet_GetError());
 		} else {
 			_address = Common::String::format(
 				"http://%u.%u.%u.%u:%u/",


Commit: cda41d2fb4cf45b43358ac3a6848575efb8202de
    https://github.com/scummvm/scummvm/commit/cda41d2fb4cf45b43358ac3a6848575efb8202de
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2016-09-03T07:58:35+02:00

Commit Message:
CREATE_PROJECT: Add CURL and SDL_net to the list of libraries for cmake generation

Changed paths:
    devtools/create_project/cmake.cpp



diff --git a/devtools/create_project/cmake.cpp b/devtools/create_project/cmake.cpp
index 1423e68..fad9a28 100644
--- a/devtools/create_project/cmake.cpp
+++ b/devtools/create_project/cmake.cpp
@@ -48,7 +48,9 @@ const CMakeProvider::Library *CMakeProvider::getLibraryFromFeature(const char *f
 		{ "vorbis",    0,              0,          0,                       0,                     "vorbisfile vorbis ogg" },
 		{ "theora",    0,              0,          0,                       0,                     "theoradec"  },
 		{ "fluidsynth",0,              0,          0,                       0,                     "fluidsynth" },
-		{ "faad",      0,              0,          0,                       0,                     "faad"       }
+		{ "faad",      0,              0,          0,                       0,                     "faad"       },
+		{ "libcurl",   "FindCURL",     "CURL",     "CURL_INCLUDE_DIRS",     "CURL_LIBRARIES",      0            },
+		{ "sdlnet",    "FindSDL_net",  "SDL_net",  "SDL_NET_INCLUDE_DIRS",  "SDL_NET_LIBRARIES",   0            }
 	};
 
 	for (unsigned int i = 0; i < sizeof(s_libraries) / sizeof(s_libraries[0]); i++) {