[Scummvm-cvs-logs] scummvm master -> 51778ed4af069c0286cbe165d224dfd4524fc211
dhewg
dhewg at wiibrew.org
Mon Jan 23 18:46:23 CET 2012
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
77c9be7998 COMMON: Fix compilation with mingw-w64
51778ed4af TASKBAR: Fix compilation with mingw-w64
Commit: 77c9be7998b85da24ae292f7eda1e478b32f2e64
https://github.com/scummvm/scummvm/commit/77c9be7998b85da24ae292f7eda1e478b32f2e64
Author: dhewg (dhewg at wiibrew.org)
Date: 2012-01-23T09:22:50-08:00
Commit Message:
COMMON: Fix compilation with mingw-w64
setjmp and longjmp are being used in system headers.
Allow these symbols globally instead of hacking the appropriate
defines in every file including windows.h.
Changed paths:
common/forbidden.h
diff --git a/common/forbidden.h b/common/forbidden.h
index 95c1a47..8b5a2f7 100644
--- a/common/forbidden.h
+++ b/common/forbidden.h
@@ -182,7 +182,8 @@
#define putchar(a) FORBIDDEN_SYMBOL_REPLACEMENT
#endif
-
+// mingw-w64 uses [set|long]jmp in system headers
+#ifndef __MINGW64__
#ifndef FORBIDDEN_SYMBOL_EXCEPTION_setjmp
#undef setjmp
#define setjmp(a) FORBIDDEN_SYMBOL_REPLACEMENT
@@ -192,6 +193,7 @@
#undef longjmp
#define longjmp(a,b) FORBIDDEN_SYMBOL_REPLACEMENT
#endif
+#endif // __MINGW64__
#ifndef FORBIDDEN_SYMBOL_EXCEPTION_system
#undef system
Commit: 51778ed4af069c0286cbe165d224dfd4524fc211
https://github.com/scummvm/scummvm/commit/51778ed4af069c0286cbe165d224dfd4524fc211
Author: dhewg (dhewg at wiibrew.org)
Date: 2012-01-23T09:41:45-08:00
Commit Message:
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.
Changed paths:
backends/taskbar/win32/win32-taskbar.cpp
diff --git a/backends/taskbar/win32/win32-taskbar.cpp b/backends/taskbar/win32/win32-taskbar.cpp
index 046ddb1..4cc4512 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
More information about the Scummvm-git-logs
mailing list