thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
This makes it consistent with other library support variables.
This commit is contained in:
Johannes Schickel 2014-01-21 19:01:28 +01:00
parent 2e93f5aba2
commit 4412e12deb
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backends/platform/sdl/posix/posix.cpp
View file

@ -50,7 +50,7 @@ void OSystem_POSIX::init() {
// Initialze File System Factory // Initialze File System Factory
_fsFactory = new POSIXFilesystemFactory(); _fsFactory = new POSIXFilesystemFactory();
#if defined(USE_TASKBAR) && defined(USE_TASKBAR_UNITY) #if defined(USE_TASKBAR) && defined(USE_UNITY)
// Initialize taskbar manager // Initialize taskbar manager
_taskbarManager = new UnityTaskbarManager(); _taskbarManager = new UnityTaskbarManager();
#endif #endif
@ -67,7 +67,7 @@ void OSystem_POSIX::initBackend() {
// Invoke parent implementation of this method // Invoke parent implementation of this method
OSystem_SDL::initBackend(); 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) // 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); _eventManager->getEventDispatcher()->registerSource((UnityTaskbarManager *)_taskbarManager, false);
#endif #endif

2
backends/taskbar/unity/unity-taskbar.cpp
View file

@ -24,7 +24,7 @@
#define FORBIDDEN_SYMBOL_EXCEPTION_time_h #define FORBIDDEN_SYMBOL_EXCEPTION_time_h
#include "common/scummsys.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" #include "backends/taskbar/unity/unity-taskbar.h"

2
backends/taskbar/unity/unity-taskbar.h
View file

@ -23,7 +23,7 @@
#ifndef BACKEND_UNITY_TASKBAR_H #ifndef BACKEND_UNITY_TASKBAR_H
#define 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/events.h"
#include "common/str.h" #include "common/str.h"

2
configure vendored
View file

@ -3727,7 +3727,7 @@ if test "$_libunity" = yes ; then
LIBS="$LIBS $LIBUNITY_LIBS" LIBS="$LIBS $LIBUNITY_LIBS"
INCLUDES="$INCLUDES $LIBUNITY_CFLAGS" INCLUDES="$INCLUDES $LIBUNITY_CFLAGS"
fi fi
define_in_config_h_if_yes "$_libunity" 'USE_TASKBAR_UNITY' define_in_config_h_if_yes "$_libunity" 'USE_UNITY'
fi fi
echo "$_libunity" echo "$_libunity"