aboutsummaryrefslogtreecommitdiff
path: root/backends/taskbar
diff options
context:
space:
mode:
authordhewg2012-01-23 18:33:09 +0100
committerdhewg2012-01-23 18:41:45 +0100
commit51778ed4af069c0286cbe165d224dfd4524fc211 (patch)
tree5a1fba40883a71fde11bf81a1d22b33a0794392f /backends/taskbar
parent77c9be7998b85da24ae292f7eda1e478b32f2e64 (diff)
downloadscummvm-rg350-51778ed4af069c0286cbe165d224dfd4524fc211.tar.gz
scummvm-rg350-51778ed4af069c0286cbe165d224dfd4524fc211.tar.bz2
scummvm-rg350-51778ed4af069c0286cbe165d224dfd4524fc211.zip
TASKBAR: Fix compilation with mingw-w64
mingw-compat.h is not required for newer mingw-w64, all required symbols are present in the system headers.
Diffstat (limited to 'backends/taskbar')
-rw-r--r--backends/taskbar/win32/win32-taskbar.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/backends/taskbar/win32/win32-taskbar.cpp b/backends/taskbar/win32/win32-taskbar.cpp
index 046ddb1cd0..4cc451247b 100644
--- a/backends/taskbar/win32/win32-taskbar.cpp
+++ b/backends/taskbar/win32/win32-taskbar.cpp
@@ -29,13 +29,9 @@
#if defined(WIN32) && defined(USE_TASKBAR)
// Needed for taskbar functions
-#if defined(__GNUC__)
-#ifdef __MINGW32__
+#if defined(__GNUC__) && defined(__MINGW32__) && !defined(__MINGW64__)
#include "backends/taskbar/win32/mingw-compat.h"
#else
- #error Only compilation with MingW is supported
-#endif
-#else
// We need certain functions that are excluded by default
#undef NONLS
#undef NOICONS
@@ -44,9 +40,12 @@
#undef ARRAYSIZE
#endif
- // Default MSVC headers for ITaskbarList3 and IShellLink
- #include <SDKDDKVer.h>
+ #if defined(_MSC_VER)
+ // Default MSVC headers for ITaskbarList3 and IShellLink
+ #include <SDKDDKVer.h>
+ #endif
#endif
+
#include <shlobj.h>
// For HWND