[Scummvm-cvs-logs] scummvm master -> f93ebdc936523984212fd3a150dc86efe80a4004

Tue Jan 21 23:15:44 CET 2014

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:
4412e12deb BUILD: Rename libunity support variable to "USE_UNITY" instead of "USE_TASKBAR_UNITY".
db07a1cfac BUILD: Auto detect taskbar support.
f93ebdc936 Merge pull request #421 from lordhoto/taskbar-cleanup


Commit: 4412e12debd77a5cef60054d2ad437a180d00817
    https://github.com/scummvm/scummvm/commit/4412e12debd77a5cef60054d2ad437a180d00817
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-01-21T10:01:28-08:00

Commit Message:
BUILD: Rename libunity support variable to "USE_UNITY" instead of "USE_TASKBAR_UNITY".

This makes it consistent with other library support variables.

Changed paths:
    backends/platform/sdl/posix/posix.cpp
    backends/taskbar/unity/unity-taskbar.cpp
    backends/taskbar/unity/unity-taskbar.h
    configure

diff --git a/backends/platform/sdl/posix/posix.cpp b/backends/platform/sdl/posix/posix.cpp
index 954f404..1752153 100644
--- a/backends/platform/sdl/posix/posix.cpp
+++ b/backends/platform/sdl/posix/posix.cpp
@@ -50,7 +50,7 @@ void OSystem_POSIX::init() {
 	// Initialze File System Factory
 	_fsFactory = new POSIXFilesystemFactory();
 
-#if defined(USE_TASKBAR) && defined(USE_TASKBAR_UNITY)
+#if defined(USE_TASKBAR) && defined(USE_UNITY)
 	// Initialize taskbar manager
 	_taskbarManager = new UnityTaskbarManager();
 #endif
@@ -67,7 +67,7 @@ void OSystem_POSIX::initBackend() {
 	// Invoke parent implementation of this method
 	OSystem_SDL::initBackend();
 
-#if defined(USE_TASKBAR) && defined(USE_TASKBAR_UNITY)
+#if defined(USE_TASKBAR) && defined(USE_UNITY)
 	// Register the taskbar manager as an event source (this is necessary for the glib event loop to be run)
 	_eventManager->getEventDispatcher()->registerSource((UnityTaskbarManager *)_taskbarManager, false);
 #endif
diff --git a/backends/taskbar/unity/unity-taskbar.cpp b/backends/taskbar/unity/unity-taskbar.cpp
index f36e2bf..1b82e58 100644
--- a/backends/taskbar/unity/unity-taskbar.cpp
+++ b/backends/taskbar/unity/unity-taskbar.cpp
@@ -24,7 +24,7 @@
 #define FORBIDDEN_SYMBOL_EXCEPTION_time_h
 #include "common/scummsys.h"
 
-#if defined(POSIX) && defined(USE_TASKBAR) && defined(USE_TASKBAR_UNITY)
+#if defined(POSIX) && defined(USE_TASKBAR) && defined(USE_UNITY)
 
 #include "backends/taskbar/unity/unity-taskbar.h"
 
diff --git a/backends/taskbar/unity/unity-taskbar.h b/backends/taskbar/unity/unity-taskbar.h
index d1d9430..d818ed9 100644
--- a/backends/taskbar/unity/unity-taskbar.h
+++ b/backends/taskbar/unity/unity-taskbar.h
@@ -23,7 +23,7 @@
 #ifndef BACKEND_UNITY_TASKBAR_H
 #define BACKEND_UNITY_TASKBAR_H
 
-#if defined(POSIX) && defined(USE_TASKBAR) && defined(USE_TASKBAR_UNITY)
+#if defined(POSIX) && defined(USE_TASKBAR) && defined(USE_UNITY)
 
 #include "common/events.h"
 #include "common/str.h"
diff --git a/configure b/configure
index db78feb..adeba28 100755
--- a/configure
+++ b/configure
@@ -3727,7 +3727,7 @@ if test "$_libunity" = yes ; then
 	LIBS="$LIBS $LIBUNITY_LIBS"
 	INCLUDES="$INCLUDES $LIBUNITY_CFLAGS"
 fi
-define_in_config_h_if_yes "$_libunity" 'USE_TASKBAR_UNITY'
+define_in_config_h_if_yes "$_libunity" 'USE_UNITY'
 fi
 echo "$_libunity"
 


Commit: db07a1cfacdb67be02a64dcecfb22e773a733fca
    https://github.com/scummvm/scummvm/commit/db07a1cfacdb67be02a64dcecfb22e773a733fca
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-01-21T10:34:32-08:00

Commit Message:
BUILD: Auto detect taskbar support.

Formerly the taskbar support was *always* enabled except when the backend or
user specified that it should be disabled. This causes nasty crashes for
backends which do not have any taskbar support (like DC, Tizen and probably
more which simply did not disable it so far) when defaultErrorHandler was
called for example (Mass Add is also broken for those).
The SDL (and derived backends) worked around missing taskbar support by
simply faking a dummy taskbar implementation (but still claiming in configure
that we feature taskbar integration, ouch).

To avoid all non-SDL backends from manually specifying _taskbar=no I added
some auto detection code which simply only enables taskbar support in case
ScummVM is built on Win32 or libunity is present.

Changed paths:
    configure



diff --git a/configure b/configure
index adeba28..d47a460 100755
--- a/configure
+++ b/configure
@@ -126,7 +126,7 @@ _opengl=auto
 _opengles=auto
 _readline=auto
 _freetype2=auto
-_taskbar=yes
+_taskbar=auto
 _updates=no
 _libunity=auto
 # Default option behavior yes/no
@@ -2427,7 +2427,6 @@ if test -n "$_host"; then
 			CXXFLAGS="$CXXFLAGS -fno-delayed-branch"
 			_backend="dc"
 			_build_scalers=no
-			_taskbar=no
 			_mad=yes
 			_zlib=yes
 			add_line_to_config_mk 'ronindir = /usr/local/ronin'
@@ -2686,7 +2685,6 @@ if test -n "$_host"; then
 			_backend="tizen"
 			_port_mk="backends/platform/tizen/tizen.mk"
 			_arm_asm=yes
-			_taskbar=no
 			_build_scalers=no
 			_seq_midi=no
 			_mt32emu=no
@@ -3989,24 +3987,27 @@ fi
 # Check whether to build taskbar integration support
 #
 echo_n "Building taskbar integration support... "
-define_in_config_if_yes $_taskbar 'USE_TASKBAR'
-if test "$_taskbar" = yes; then
+if test "$_taskbar" = "no"; then
+	echo "no"
+else
 	case $_host_os in
 	mingw*)
 		LIBS="$LIBS -lole32 -luuid"
 		echo "win32"
+		_taskbar=yes
 		;;
 	*)
 		if test "$_libunity" = yes; then
 			echo "unity"
+			_taskbar=yes
 		else
-			echo "$_taskbar"
+			echo "no"
+			_taskbar=no
 		fi
 		;;
 	esac
-else
-	echo "$_taskbar"
 fi
+define_in_config_if_yes $_taskbar 'USE_TASKBAR'
 
 #
 # Check whether to build Bink video support


Commit: f93ebdc936523984212fd3a150dc86efe80a4004
    https://github.com/scummvm/scummvm/commit/f93ebdc936523984212fd3a150dc86efe80a4004
Author: Johannes Schickel (lordhoto at gmail.com)
Date: 2014-01-21T14:15:19-08:00

Commit Message:
Merge pull request #421 from lordhoto/taskbar-cleanup

BUILD: Taskbar Cleanup/Fixes

Changed paths:
    backends/platform/sdl/posix/posix.cpp
    backends/taskbar/unity/unity-taskbar.cpp
    backends/taskbar/unity/unity-taskbar.h
    configure







