[Scummvm-git-logs] scummvm master -> 3df7f5a93fb51497407b2cd4ac609c0f008615e7
lephilousophe
noreply at scummvm.org
Sun Jul 27 15:40:55 UTC 2025
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
3df7f5a93f WIN32: Fix mingw-w64-x86 build
Commit: 3df7f5a93fb51497407b2cd4ac609c0f008615e7
https://github.com/scummvm/scummvm/commit/3df7f5a93fb51497407b2cd4ac609c0f008615e7
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2025-07-27T17:37:27+02:00
Commit Message:
WIN32: Fix mingw-w64-x86 build
Mingw64 in x86 mode doesn't define __MINGW64__ but the path is still the
standard one.
Mingw (the classic one) does define __MINGW32_VERSION while Mingw64 does
not and is used to discriminate between both projects.
Changed paths:
backends/audiocd/win32/win32-audiocd.cpp
diff --git a/backends/audiocd/win32/win32-audiocd.cpp b/backends/audiocd/win32/win32-audiocd.cpp
index ff11d5985e2..ae38c82a157 100644
--- a/backends/audiocd/win32/win32-audiocd.cpp
+++ b/backends/audiocd/win32/win32-audiocd.cpp
@@ -61,8 +61,9 @@
#include "common/timer.h"
#include <winioctl.h>
-#if defined(__MINGW32__) && !defined(__MINGW64__)
+#if defined(__MINGW32_VERSION)
// Classic MinGW uses non standard paths for DDK headers.
+// __MINGW32_VERSION is not defined by the not classic Ming-w64
#include <ddk/ntddcdrm.h>
#else
#include <ntddcdrm.h>
More information about the Scummvm-git-logs
mailing list