ryujinx-archive/GtkSharp
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unnecessary glue for atk/gdk/pango

Browse source
This commit is contained in:
Thibault Saunier 2017-09-02 11:18:45 -03:00
parent e43baacb48
commit 676d8bdea3
7 changed files with 0 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atk/generated/meson.build
View file

@ -107,8 +107,6 @@ source_gen = custom_target('atk_generated',
'--metadata', metadata_fname, '--metadata', metadata_fname,
'--gapi-codegen', gapi_codegen.full_path(), '--gapi-codegen', gapi_codegen.full_path(),
'--extra-includes', glib_api_includes, '--extra-includes', glib_api_includes,
'--glue-file', gluefile,
'--glue-includes', glueincludes,
'--out', meson.current_build_dir(), '--out', meson.current_build_dir(),
'--files', ';'.join(generated_sources), '--files', ';'.join(generated_sources),
'--assembly-name', meson.project_name() '--assembly-name', meson.project_name()

12
atk/meson.build
View file

@ -4,8 +4,6 @@ pkg = 'atk'
assembly_name = pkg + '-sharp' assembly_name = pkg + '-sharp'
raw_api_fname = join_paths(meson.current_source_dir(), pkg + '-api.raw') raw_api_fname = join_paths(meson.current_source_dir(), pkg + '-api.raw')
metadata_fname = join_paths(meson.current_source_dir(), 'Atk.metadata') metadata_fname = join_paths(meson.current_source_dir(), 'Atk.metadata')
glueincludes = 'atk/atk.h'
gluefile = join_paths(meson.current_build_dir(), 'generate.c')
configure_file(input: assembly_name + '.dll.config.in', configure_file(input: assembly_name + '.dll.config.in',
output: assembly_name + '.dll.config', output: assembly_name + '.dll.config',
@ -31,16 +29,6 @@ atk_sharp = library(assembly_name, source_gen, sources,
install_dir: lib_install_dir install_dir: lib_install_dir
) )
gluegen = custom_target('atkgluegen',
input: raw_api_fname,
output: 'generate.c',
command: [generate_api, '--fakeglue'],
depends: [source_gen])
library('atksharpglue-3', gluegen,
dependencies: [glib_dep, gio_dep, atk_dep],
install: install)
nuget_infos += [['AtkSharp', atk_sharp, ['GlibSharp', 'GioSharp']]] nuget_infos += [['AtkSharp', atk_sharp, ['GlibSharp', 'GioSharp']]]
install_infos += [assembly_name, atk_sharp.full_path()] install_infos += [assembly_name, atk_sharp.full_path()]
atk_sharp_dep = declare_dependency(link_with: [glib_sharp, atk_sharp]) atk_sharp_dep = declare_dependency(link_with: [glib_sharp, atk_sharp])

2
cairo/meson.build
View file

@ -3,8 +3,6 @@ assembly_name = 'cairo-sharp'
raw_api_fname = join_paths(meson.current_source_dir(), 'cairo-api.raw') raw_api_fname = join_paths(meson.current_source_dir(), 'cairo-api.raw')
metadata_fname = join_paths(meson.current_source_dir(), 'cairo.metadata') metadata_fname = join_paths(meson.current_source_dir(), 'cairo.metadata')
glueincludes = ''
gluefile = join_paths(meson.current_build_dir(), 'generate.c')
sources = [ sources = [
'Antialias.cs', 'Antialias.cs',

3
gdk/generated/meson.build
View file

@ -206,12 +206,9 @@ source_gen = custom_target(assembly_name + 'codegen',
'--extra-includes', pango_api_includes, '--extra-includes', pango_api_includes,
'--extra-includes', gio_api_includes, '--extra-includes', gio_api_includes,
'--extra-includes', cairo_api_includes, '--extra-includes', cairo_api_includes,
'--glue-file', gluefile,
'--glue-includes', glueincludes,
'--out', meson.current_build_dir(), '--out', meson.current_build_dir(),
'--files', ';'.join(generated_sources), '--files', ';'.join(generated_sources),
'--assembly-name', assembly_name, '--assembly-name', assembly_name,
'--glue-libname', gluefile,
'--schema', schema, '--schema', schema,
], ],
depends: [gapi_codegen, gapi_fixup]) depends: [gapi_codegen, gapi_fixup])

12
gdk/meson.build
View file

@ -5,8 +5,6 @@ symbols = join_paths(meson.current_source_dir(), 'gdk-symbols.xml')
raw_api_fname = join_paths(meson.current_source_dir(), 'gdk-api.raw') raw_api_fname = join_paths(meson.current_source_dir(), 'gdk-api.raw')
metadata_fname = join_paths(meson.current_source_dir(), 'Gdk.metadata') metadata_fname = join_paths(meson.current_source_dir(), 'Gdk.metadata')
glueincludes = 'gdk/gdk.h'
gluefile = join_paths(meson.current_build_dir(), 'generate.c')
configure_file(input: assembly_name + '.dll.config.in', configure_file(input: assembly_name + '.dll.config.in',
output: assembly_name + '.dll.config', output: assembly_name + '.dll.config',
@ -73,16 +71,6 @@ gdk_sharp = library(assembly_name, source_gen, sources,
install_dir: lib_install_dir install_dir: lib_install_dir
) )
gluegen = custom_target('gdkgluegen',
input: raw_api_fname,
output: 'generate.c',
command: [generate_api, '--fakeglue'],
depends: [source_gen])
library('gdksharpglue-3', gluegen,
dependencies: [glib_dep, gio_dep, atk_dep, gdk_dep],
install: install)
nuget_infos += [['GdkSharp', gdk_sharp, ['GlibSharp', 'GioSharp', 'AtkSharp']]] nuget_infos += [['GdkSharp', gdk_sharp, ['GlibSharp', 'GioSharp', 'AtkSharp']]]
install_infos += [assembly_name, gdk_sharp.full_path()] install_infos += [assembly_name, gdk_sharp.full_path()]
gdk_sharp_dep = declare_dependency(link_with: deps + [gdk_sharp]) gdk_sharp_dep = declare_dependency(link_with: deps + [gdk_sharp])

2
pango/generated/meson.build
View file

@ -121,8 +121,6 @@ source_gen = custom_target('pango_generated',
'--gapi-codegen', gapi_codegen.full_path(), '--gapi-codegen', gapi_codegen.full_path(),
'--extra-includes', glib_api_includes, '--extra-includes', glib_api_includes,
'--extra-includes', cairo_api_includes, '--extra-includes', cairo_api_includes,
'--glue-file', gluefile,
'--glue-includes', glueincludes,
'--out', meson.current_build_dir(), '--out', meson.current_build_dir(),
'--files', ';'.join(generated_sources), '--files', ';'.join(generated_sources),
'--assembly-name', assembly_name, '--assembly-name', assembly_name,

12
pango/meson.build
View file

@ -1,10 +1,8 @@
snk = join_paths(meson.current_source_dir(), '..', 'gtk-sharp.snk') snk = join_paths(meson.current_source_dir(), '..', 'gtk-sharp.snk')
pkg = 'pango' pkg = 'pango'
assembly_name = pkg + '-sharp' assembly_name = pkg + '-sharp'
glueincludes = 'pango/pango.h'
raw_api_fname = join_paths(meson.current_source_dir(), pkg + '-api.raw') raw_api_fname = join_paths(meson.current_source_dir(), pkg + '-api.raw')
metadata_fname = join_paths(meson.current_source_dir(), 'Pango.metadata') metadata_fname = join_paths(meson.current_source_dir(), 'Pango.metadata')
gluefile = join_paths(meson.current_build_dir(), 'generate.c')
configure_file(input: assembly_name + '.dll.config.in', configure_file(input: assembly_name + '.dll.config.in',
output: assembly_name + '.dll.config', output: assembly_name + '.dll.config',
@ -67,16 +65,6 @@ pango_sharp = library(assembly_name, source_gen, sources,
install_dir: lib_install_dir install_dir: lib_install_dir
) )
gluegen = custom_target('pangogluegen',
input: raw_api_fname,
output: 'generate.c',
command: [generate_api, '--fakeglue'],
depends: [source_gen])
library('pangosharpglue-3', gluegen,
dependencies: [glib_dep, gio_dep, pango_dep],
install: install)
nuget_infos += [['PangoSharp', pango_sharp, ['GlibSharp', 'GioSharp']]] nuget_infos += [['PangoSharp', pango_sharp, ['GlibSharp', 'GioSharp']]]
install_infos += [assembly_name, pango_sharp.full_path()] install_infos += [assembly_name, pango_sharp.full_path()]
pango_sharp_dep = declare_dependency(link_with: deps + [pango_sharp]) pango_sharp_dep = declare_dependency(link_with: deps + [pango_sharp])