diff options
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/platform/sdl/win32/win32.cpp | 4 | ||||
| -rw-r--r-- | backends/taskbar/unity/unity-taskbar.cpp | 2 | ||||
| -rw-r--r-- | backends/taskbar/unity/unity-taskbar.h | 2 | ||||
| -rw-r--r-- | backends/taskbar/win32/win32-taskbar.cpp | 2 | ||||
| -rw-r--r-- | backends/taskbar/win32/win32-taskbar.h | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp index bb254786d5..0a6702b6d9 100644 --- a/backends/platform/sdl/win32/win32.cpp +++ b/backends/platform/sdl/win32/win32.cpp @@ -85,9 +85,11 @@ void OSystem_Win32::init() { // Initialize File System Factory _fsFactory = new WindowsFilesystemFactory(); - // Initialize task bar manager +#if defined(USE_TASKBAR) + // Initialize taskbar manager _taskbarManager = new Win32TaskbarManager(); ((Win32TaskbarManager *)_taskbarManager)->init(); +#endif // Invoke parent implementation of this method OSystem_SDL::init(); diff --git a/backends/taskbar/unity/unity-taskbar.cpp b/backends/taskbar/unity/unity-taskbar.cpp index 98616a7587..4a074abca2 100644 --- a/backends/taskbar/unity/unity-taskbar.cpp +++ b/backends/taskbar/unity/unity-taskbar.cpp @@ -23,7 +23,7 @@ * */ -#if defined(UNIX) +#if defined(UNIX) && defined(USE_TASKBAR) #include "backends/taskbar/unity/unity-taskbar.h" diff --git a/backends/taskbar/unity/unity-taskbar.h b/backends/taskbar/unity/unity-taskbar.h index a49f369cac..cd8efdaf2a 100644 --- a/backends/taskbar/unity/unity-taskbar.h +++ b/backends/taskbar/unity/unity-taskbar.h @@ -26,7 +26,7 @@ #ifndef BACKEND_UNITY_TASKBAR_H #define BACKEND_UNITY_TASKBAR_H -#if defined(UNIX) +#if defined(UNIX) && defined(USE_TASKBAR) #include "common/str.h" #include "common/taskbar.h" diff --git a/backends/taskbar/win32/win32-taskbar.cpp b/backends/taskbar/win32/win32-taskbar.cpp index 768bf5b64e..91c4e2399c 100644 --- a/backends/taskbar/win32/win32-taskbar.cpp +++ b/backends/taskbar/win32/win32-taskbar.cpp @@ -23,7 +23,7 @@ * */ -#if defined(WIN32) +#if defined(WIN32) && defined(USE_TASKBAR) // Needed for taskbar functions #if defined(__GNUC__) diff --git a/backends/taskbar/win32/win32-taskbar.h b/backends/taskbar/win32/win32-taskbar.h index f9ce9c16fc..7d963c19ca 100644 --- a/backends/taskbar/win32/win32-taskbar.h +++ b/backends/taskbar/win32/win32-taskbar.h @@ -26,7 +26,7 @@ #ifndef BACKEND_WIN32_TASKBAR_H #define BACKEND_WIN32_TASKBAR_H -#if defined(WIN32) +#if defined(WIN32) && defined(USE_TASKBAR) #include "common/str.h" #include "common/taskbar.h" |