mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 19:29:01 +08:00
25eaff7533
* [cairo] upgrade cairo to 1.7.6 (microsoft#23848) * [cairo] remove patch (microsoft#23848) 0001-meson-fix-macOS-build-and-add-macOS-ci.patch has been merged into the upstream repository and is part of the 1.7.6 release. * [cairo] use meson option to disable bfd (microsoft#23848) Upstream has introduced an option to disable bfd. Use the option to disable it (See microsoft#23022) * [cairo] chase upstream cflags handling (microsoft#23848) Upstream has put all cflags handling into the top-level meson. Move our static compilation indicator definition to the top level, too. * [cairo] force-disable xcb (microsoft#23848) This is the next update * [cairo] format vcpkg.json (microsoft#23848) * [cairo] update version registries (microsoft#23848) * [cairo] add license (microsoft#23848) * [cairo] regenerate versions registry (microsoft#23848) Co-authored-by: Schaich <alonso.schaich@sodgeit.de>
17 lines
619 B
Diff
17 lines
619 B
Diff
--- meson.build.orig 2022-03-19 03:40:07.000000000 +0900
|
|
+++ meson.build 2022-03-29 21:32:41.000000000 +0900
|
|
@@ -100,6 +100,13 @@
|
|
# Autotools compatibility
|
|
add_project_arguments('-DHAVE_CONFIG_H', language: 'c')
|
|
|
|
+if host_machine.system() == 'windows'
|
|
+ lib_default = get_option('default_library')
|
|
+ if lib_default == 'static'
|
|
+ add_project_arguments('-DCAIRO_WIN32_STATIC_BUILD', language: 'c')
|
|
+ endif
|
|
+endif
|
|
+
|
|
# Make sure source directory hasn't been configured with autotools
|
|
fs = import('fs')
|
|
if fs.exists('config.h') or fs.exists('src/cairo-features.h') or fs.exists('src/cairo-supported-features.h')
|