fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2025-12-20 12:50:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'defining-windows-version-macros-in-meson-build' into 'master'

Browse source 
Defining Windows version macros in meson.build

See merge request cairo/cairo!404
This commit is contained in:
Adrian Johnson 2023-01-12 21:33:19 +00:00
commit c80cd3a0c6
16 changed files with 6 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
boilerplate/cairo-boilerplate-win32-printing.c
View file

@ -26,14 +26,6 @@
* Adrian Johnson <ajohnson@redneon.com> * Adrian Johnson <ajohnson@redneon.com>
*/ */
/* We require Windows 2000 features such as GetDefaultPrinter() */
#if !defined(WINVER) || (WINVER < 0x0500)
# define WINVER 0x0500
#endif
#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500)
# define _WIN32_WINNT 0x0500
#endif
#include "cairo-boilerplate-private.h" #include "cairo-boilerplate-private.h"
#include "cairo-malloc-private.h" #include "cairo-malloc-private.h"

6
meson.build
View file

@ -495,6 +495,8 @@ if host_machine.system() == 'darwin' and not get_option('quartz').disabled()
endif endif
if host_machine.system() == 'windows' if host_machine.system() == 'windows'
add_project_arguments('-DWIN32_LEAN_AND_MEAN', '-DNOMINMAX', language: ['c', 'cpp'])
win32_extra_deps = [ win32_extra_deps = [
cc.find_library('gdi32'), cc.find_library('gdi32'),
cc.find_library('msimg32'), cc.find_library('msimg32'),
@ -545,6 +547,10 @@ if host_machine.system() == 'windows'
if cpp_compiler.has_header('dwrite_3.h') and cpp_compiler.get_define('__MINGW32__') == '' if cpp_compiler.has_header('dwrite_3.h') and cpp_compiler.get_define('__MINGW32__') == ''
conf.set('HAVE_DWRITE_3_H', 1) conf.set('HAVE_DWRITE_3_H', 1)
endif endif
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'])
endif endif
endif endif

1
perf/cairo-perf.c
View file

@ -37,7 +37,6 @@
#endif #endif
#if defined(_WIN32) #if defined(_WIN32)
#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#elif defined(_POSIX_PRIORITY_SCHEDULING) #elif defined(_POSIX_PRIORITY_SCHEDULING)
#include <sched.h> #include <sched.h>

1
perf/dirent-win32.h
View file

@ -26,7 +26,6 @@
#include "cairo-compiler-private.h" #include "cairo-compiler-private.h"
#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#define stat _stat #define stat _stat

9
src/cairo-misc.c
View file

@ -976,15 +976,6 @@ _cairo_fopen (const char *filename, const char *mode, FILE **file_out)
#ifdef _WIN32 #ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
/* We require Windows 2000 features such as ETO_PDY */
#if !defined(WINVER) || (WINVER < 0x0500)
# define WINVER 0x0500
#endif
#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500)
# define _WIN32_WINNT 0x0500
#endif
#include <windows.h> #include <windows.h>
#include <io.h> #include <io.h>

9
src/cairo-mutex-impl-private.h
View file

@ -179,15 +179,6 @@
#elif defined(_WIN32) /******************************************************/ #elif defined(_WIN32) /******************************************************/
#define WIN32_LEAN_AND_MEAN
/* We require Windows 2000 features such as ETO_PDY */
#if !defined(WINVER) || (WINVER < 0x0500)
# define WINVER 0x0500
#endif
#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500)
# define _WIN32_WINNT 0x0500
#endif
# include <windows.h> # include <windows.h>
typedef CRITICAL_SECTION cairo_mutex_impl_t; typedef CRITICAL_SECTION cairo_mutex_impl_t;

1
src/cairo-time.c
View file

@ -62,7 +62,6 @@ _cairo_time_get (void)
} }
#elif _WIN32 #elif _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
static cairo_always_inline double static cairo_always_inline double

1
src/cairo-wgl-context.c
View file

@ -43,7 +43,6 @@
#include "cairo-error-private.h" #include "cairo-error-private.h"
#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
typedef struct _cairo_wgl_context { typedef struct _cairo_wgl_context {

9
src/win32/cairo-win32-debug.c
View file

@ -37,15 +37,6 @@
* Vladimir Vukicevic <vladimir@pobox.com> * Vladimir Vukicevic <vladimir@pobox.com>
*/ */
#define WIN32_LEAN_AND_MEAN
/* We require Windows 2000 features such as ETO_PDY */
#if !defined(WINVER) || (WINVER < 0x0500)
# define WINVER 0x0500
#endif
#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500)
# define _WIN32_WINNT 0x0500
#endif
#include "cairoint.h" #include "cairoint.h"
#include "cairo-win32-private.h" #include "cairo-win32-private.h"

9
src/win32/cairo-win32-device.c
View file

@ -37,15 +37,6 @@
* Vladimir Vukicevic <vladimir@pobox.com> * Vladimir Vukicevic <vladimir@pobox.com>
*/ */
#define WIN32_LEAN_AND_MEAN
/* We require Windows 2000 features such as ETO_PDY */
#if !defined(WINVER) || (WINVER < 0x0500)
# define WINVER 0x0500
#endif
#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500)
# define _WIN32_WINNT 0x0500
#endif
#include "cairoint.h" #include "cairoint.h"
#include "cairo-atomic-private.h" #include "cairo-atomic-private.h"

9
src/win32/cairo-win32-display-surface.c
View file

@ -37,15 +37,6 @@
* Vladimir Vukicevic <vladimir@pobox.com> * Vladimir Vukicevic <vladimir@pobox.com>
*/ */
#define WIN32_LEAN_AND_MEAN
/* We require Windows 2000 features such as ETO_PDY */
#if !defined(WINVER) || (WINVER < 0x0500)
# define WINVER 0x0500
#endif
#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500)
# define _WIN32_WINNT 0x0500
#endif
#include "cairoint.h" #include "cairoint.h"
#include "cairo-clip-private.h" #include "cairo-clip-private.h"

9
src/win32/cairo-win32-font.c
View file

@ -33,15 +33,6 @@
* Contributor(s): * Contributor(s):
*/ */
#define WIN32_LEAN_AND_MEAN
/* We require Windows 2000 features such as GetGlyphIndices */
#if !defined(WINVER) || (WINVER < 0x0500)
# define WINVER 0x0500
#endif
#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500)
# define _WIN32_WINNT 0x0500
#endif
#include "cairoint.h" #include "cairoint.h"
#include "cairo-win32-private.h" #include "cairo-win32-private.h"

9
src/win32/cairo-win32-printing-surface.c
View file

@ -35,15 +35,6 @@
* Vladimir Vukicevic <vladimir@pobox.com> * Vladimir Vukicevic <vladimir@pobox.com>
*/ */
#define WIN32_LEAN_AND_MEAN
/* We require Windows 2000 features such as ETO_PDY */
#if !defined(WINVER) || (WINVER < 0x0500)
# define WINVER 0x0500
#endif
#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500)
# define _WIN32_WINNT 0x0500
#endif
#include "cairoint.h" #include "cairoint.h"
#include "cairo-default-context-private.h" #include "cairo-default-context-private.h"

9
src/win32/cairo-win32-surface.c
View file

@ -37,15 +37,6 @@
* Vladimir Vukicevic <vladimir@pobox.com> * Vladimir Vukicevic <vladimir@pobox.com>
*/ */
#define WIN32_LEAN_AND_MEAN
/* We require Windows 2000 features such as ETO_PDY */
#if !defined(WINVER) || (WINVER < 0x0500)
# define WINVER 0x0500
#endif
#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500)
# define _WIN32_WINNT 0x0500
#endif
#include "cairoint.h" #include "cairoint.h"
#include "cairo-backend-private.h" #include "cairo-backend-private.h"

9
src/win32/cairo-win32-system.c
View file

@ -50,15 +50,6 @@
#if CAIRO_MUTEX_IMPL_WIN32 #if CAIRO_MUTEX_IMPL_WIN32
#if !CAIRO_WIN32_STATIC_BUILD #if !CAIRO_WIN32_STATIC_BUILD
#define WIN32_LEAN_AND_MEAN
/* We require Windows 2000 features such as ETO_PDY */
#if !defined(WINVER) || (WINVER < 0x0500)
# define WINVER 0x0500
#endif
#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500)
# define _WIN32_WINNT 0x0500
#endif
#include <windows.h> #include <windows.h>
/* declare to avoid "no previous prototype for 'DllMain'" warning */ /* declare to avoid "no previous prototype for 'DllMain'" warning */

1
util/cairo-missing/cairo-missing.h
View file

@ -38,7 +38,6 @@
#include <sys/types.h> #include <sys/types.h>
#ifdef _WIN32 #ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#if !defined(_SSIZE_T_DEFINED) && !defined(_SSIZE_T_) #if !defined(_SSIZE_T_DEFINED) && !defined(_SSIZE_T_)