mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-08-01 15:03:39 +02:00
Revert "Meson: Fix cocoa and carbon support"
This reverts commit 2e3769a4f7
.
This commit is contained in:
@@ -417,11 +417,10 @@ if host_system != 'windows'
|
||||
contenttype_sources += files('gcontenttype.c')
|
||||
appinfo_sources += files('gdesktopappinfo.c')
|
||||
gio_unix_include_headers += files('gdesktopappinfo.h')
|
||||
subdir('xdgmime')
|
||||
internal_deps += [xdgmime_lib]
|
||||
endif
|
||||
|
||||
subdir('xdgmime')
|
||||
internal_deps += [xdgmime_lib]
|
||||
|
||||
install_headers(gio_unix_include_headers, subdir : 'gio-unix-2.0/gio')
|
||||
|
||||
if glib_conf.has('HAVE_NETLINK')
|
||||
@@ -795,7 +794,6 @@ libgio = library('gio-2.0',
|
||||
libgobject_dep, libgmodule_dep, selinux_dep, xattr_dep,
|
||||
platform_deps, network_libs],
|
||||
c_args : gio_c_args,
|
||||
objc_args : gio_c_args,
|
||||
# intl.lib is not compatible with SAFESEH
|
||||
link_args : [noseh_link_args, glib_link_flags],
|
||||
)
|
||||
@@ -941,7 +939,7 @@ executable('gdbus', 'gdbus-tool.c',
|
||||
link_args : noseh_link_args,
|
||||
dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
|
||||
|
||||
if host_system != 'windows' and not glib_have_cocoa
|
||||
if host_system != 'windows'
|
||||
executable('gapplication', 'gapplication-tool.c',
|
||||
install : true,
|
||||
c_args : gio_c_args,
|
||||
|
Reference in New Issue
Block a user