|
@@ -0,0 +1,80 @@
|
|
|
+diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
|
|
|
+index 54ff9dda3..ec0d902a9 100644
|
|
|
+--- a/gdk-pixbuf/meson.build
|
|
|
++++ b/gdk-pixbuf/meson.build
|
|
|
+@@ -75,7 +75,7 @@ gdk_pixbuf_cflags = [
|
|
|
+ '-DBUILT_MODULES_DIR="@0@"'.format(meson.current_build_dir()),
|
|
|
+ ]
|
|
|
+
|
|
|
+-gdk_pixbuf_api_path = join_paths(gdk_pixbuf_api_name, 'gdk-pixbuf')
|
|
|
++gdk_pixbuf_api_path = join_paths('gdk-pixbuf')
|
|
|
+
|
|
|
+ gdkpixbuf_features_conf = configuration_data()
|
|
|
+ gdkpixbuf_features_conf.set('GDK_PIXBUF_MAJOR', gdk_pixbuf_version_major)
|
|
|
+@@ -340,6 +340,7 @@ foreach bin: gdkpixbuf_bin
|
|
|
+ gdkpixbuf_enum_h,
|
|
|
+ dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ],
|
|
|
+ include_directories: [ root_inc, gdk_pixbuf_inc ],
|
|
|
++ link_args: ['-framework', 'CoreFoundation', '-framework', 'Foundation', '-framework', 'CoreServices', '-framework', 'AppKit'],
|
|
|
+ c_args: common_cflags + gdk_pixbuf_cflags,
|
|
|
+ install: true)
|
|
|
+ meson.override_find_program(bin_name, bin)
|
|
|
+diff --git a/gdk-pixbuf/pixops/meson.build b/gdk-pixbuf/pixops/meson.build
|
|
|
+index 101fbf669..718767ba4 100644
|
|
|
+--- a/gdk-pixbuf/pixops/meson.build
|
|
|
++++ b/gdk-pixbuf/pixops/meson.build
|
|
|
+@@ -8,6 +8,7 @@ pixops = static_library('pixops',
|
|
|
+ pixops_dep = declare_dependency(
|
|
|
+ link_with: pixops,
|
|
|
+ include_directories: [ root_inc, include_directories('.') ],
|
|
|
++ link_args: ['-framework', 'CoreFoundation', '-framework', 'Foundation', '-framework', 'CoreServices', '-framework', 'AppKit'],
|
|
|
+ dependencies: gdk_pixbuf_deps,
|
|
|
+ )
|
|
|
+
|
|
|
+diff --git a/meson.build b/meson.build
|
|
|
+index 33044e820..f73bb9bd7 100644
|
|
|
+--- a/meson.build
|
|
|
++++ b/meson.build
|
|
|
+@@ -116,7 +116,7 @@ gdk_pixbuf_conf.set('HAVE_SIGSETJMP',
|
|
|
+
|
|
|
+ # Common compiler and linker flags
|
|
|
+ common_cflags = []
|
|
|
+-common_ldflags = []
|
|
|
++common_ldflags = ['-framework', 'CoreFoundation', '-framework', 'Foundation', '-framework', 'CoreServices', '-framework', 'AppKit']
|
|
|
+
|
|
|
+ if cc.get_id() == 'msvc'
|
|
|
+ # For Visual Studio, just force-include msvc_reommended_pragmas.h
|
|
|
+@@ -414,13 +414,11 @@ subdir('gdk-pixbuf')
|
|
|
+ subdir('po')
|
|
|
+
|
|
|
+ if not meson.is_cross_build()
|
|
|
+- subdir('tests')
|
|
|
+ subdir('thumbnailer')
|
|
|
+ endif
|
|
|
+
|
|
|
+ # Documentation
|
|
|
+ build_docs = get_option('gtk_doc') or get_option('docs')
|
|
|
+-subdir('docs')
|
|
|
+
|
|
|
+ if not meson.is_cross_build()
|
|
|
+ meson.add_install_script('build-aux/post-install.py',
|
|
|
+diff --git a/thumbnailer/meson.build b/thumbnailer/meson.build
|
|
|
+index b6a206d5b..ba905c812 100644
|
|
|
+--- a/thumbnailer/meson.build
|
|
|
++++ b/thumbnailer/meson.build
|
|
|
+@@ -4,6 +4,7 @@ bin = executable('gdk-pixbuf-thumbnailer',
|
|
|
+ '-DTHUMBNAILER_RETURNS_PIXBUF',
|
|
|
+ '-DTHUMBNAILER_USAGE="Thumbnail images"',
|
|
|
+ ],
|
|
|
++ link_args: ['-framework', 'CoreFoundation', '-framework', 'Foundation', '-framework', 'CoreServices', '-framework', 'AppKit'],
|
|
|
+ dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ],
|
|
|
+ install: true)
|
|
|
+ meson.override_find_program('gdk-pixbuf-thumbnailer', bin)
|
|
|
+@@ -11,6 +12,7 @@ meson.override_find_program('gdk-pixbuf-thumbnailer', bin)
|
|
|
+ gdk_pixbuf_print_mime_types = executable('gdk-pixbuf-print-mime-types',
|
|
|
+ 'gdk-pixbuf-print-mime-types.c',
|
|
|
+ c_args: common_cflags,
|
|
|
++ link_args: ['-framework', 'CoreFoundation', '-framework', 'Foundation', '-framework', 'CoreServices', '-framework', 'AppKit'],
|
|
|
+ dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ])
|
|
|
+
|
|
|
+ custom_target('thumbnailer',
|