BUILD: Rename libunity support variable to "USE_UNITY" instead of "USE_TASKBAR_UNITY".
This makes it consistent with other library support variables.
This commit is contained in:
parent
2e93f5aba2
commit
4412e12deb
4 changed files with 5 additions and 5 deletions
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
2
configure
vendored
2
configure
vendored
|
@ -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"
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue