2 commits - meson.build

[GitLab Mirror]

 meson.build |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8e9b8564885750792eed54b7eccf6295d1ff947d
Merge: a4d5a24d6 7a780896a
Author: Emmanuele Bassi <ebassi at gmail.com>
Date:   Mon Jul 14 22:39:41 2025 +0000

    Merge branch 'win2k' into 'master'
    
    win32: Fix MSVC build with dwrite disabled
    
    See merge request cairo/cairo!618

commit 7a780896a1fc19df8ace074f387ae5cd11a4f58b
Author: Benjamin Gilbert <bgilbert at backtick.net>
Date:   Wed Mar 19 21:58:37 2025 -0600

    win32: Fix MSVC build with dwrite disabled
    
    We now require at least Windows Vista.  When dwrite is disabled, declare
    WINVER accordingly so we get the defines we no longer carry ourselves.
    The default dwrite-enabled path already has a new-enough WINVER.
    
    Fixes: d0ee67a14285 ("Win32: Remove unused code and defines for old toolchains")

diff --git a/meson.build b/meson.build
index ee2a4e70b..6dafaad6e 100644
--- a/meson.build
+++ b/meson.build
@@ -539,7 +539,7 @@ if host_machine.system() == 'windows'
 
     add_project_arguments('-DWINVER=_WIN32_WINNT_WIN10', '-D_WIN32_WINNT=_WIN32_WINNT_WIN10', '-DNTDDI_VERSION=NTDDI_WIN10_RS3', language: ['c', 'cpp'])
   else
-    add_project_arguments('-DWINVER=_WIN32_WINNT_WIN2K', '-D_WIN32_WINNT=_WIN32_WINNT_WIN2K', language: ['c', 'cpp'])
+    add_project_arguments('-DWINVER=_WIN32_WINNT_VISTA', '-D_WIN32_WINNT=_WIN32_WINNT_VISTA', language: ['c', 'cpp'])
   endif
 endif