ryujinx/GtkSharp
1
0
Fork 0
mirror of https://github.com/Ryujinx/GtkSharp.git synced 2025-06-14 03:05:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not use glue for GIO

Browse source
This commit is contained in:
Thibault Saunier 2017-09-01 13:29:14 -03:00
parent 74a4cf71e3
commit c7205a135d
5 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gio/generated/generate_code.py
View file

@ -14,9 +14,9 @@ if __name__ == "__main__":
parser.add_argument("--gapi-fixup") parser.add_argument("--gapi-fixup")
parser.add_argument("--metadata") parser.add_argument("--metadata")
parser.add_argument("--gapi-codegen") parser.add_argument("--gapi-codegen")
parser.add_argument("--glue-file") parser.add_argument("--glue-file", default="")
parser.add_argument("--glue-includes") parser.add_argument("--glue-includes", default="")
parser.add_argument("--glue-libname") parser.add_argument("--glue-libname", default="")
parser.add_argument("--assembly-name") parser.add_argument("--assembly-name")
parser.add_argument("--extra-includes", action='append', default=[]) parser.add_argument("--extra-includes", action='append', default=[])
parser.add_argument("--out") parser.add_argument("--out")

2
gio/generated/meson.build
View file

@ -403,8 +403,6 @@ source_gen = custom_target('gio_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', assembly_name, '--assembly-name', assembly_name,

12
gio/meson.build
View file

@ -4,8 +4,6 @@ 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(), 'Gio.metadata') metadata_fname = join_paths(meson.current_source_dir(), 'Gio.metadata')
glueincludes = 'gio/gio.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',
@ -38,15 +36,5 @@ gio_sharp = library(assembly_name, source_gen, sources,
install_dir: lib_install_dir install_dir: lib_install_dir
) )
gluegen = custom_target('giogluegen',
input: raw_api_fname,
output: 'generate.c',
command: [generate_api, '--fakeglue'],
depends: [source_gen])
gio_glue = library('giosharpglue-3', gluegen,
dependencies: [glib_dep, gio_dep],
install: install)
install_infos += [assembly_name, gio_sharp.full_path()] install_infos += [assembly_name, gio_sharp.full_path()]
gio_sharp_dep = declare_dependency(link_with: [glib_sharp, gio_sharp]) gio_sharp_dep = declare_dependency(link_with: [glib_sharp, gio_sharp])

2
sample/opaquetest/Makefile.am
View file

@ -5,7 +5,7 @@ assemblies=../../glib/glib-sharp.dll ../../gio/gio-sharp.dll ../../pango/pango-s
references=$(addprefix -r:, $(assemblies)) references=$(addprefix -r:, $(assemblies))
opaquetest.exe: generated-stamp OpaqueTest.cs $(assemblies) opaquetest.exe: generated-stamp OpaqueTest.cs $(assemblies)
$(CSC) $(CSFLAGS) -out:opaquetest.exe $(references) $(srcdir)/OpaqueTest.cs $(GENERATED_SOURCES_OPTION) $(CSC) $(CSFLAGS) -unsafe -out:opaquetest.exe $(references) $(srcdir)/OpaqueTest.cs $(GENERATED_SOURCES_OPTION)
libopaque_la_SOURCES = \ libopaque_la_SOURCES = \
opaques.c \ opaques.c \

2
sample/valtest/Makefile.am
View file

@ -5,7 +5,7 @@ assemblies=../../glib/glib-sharp.dll ../../gio/gio-sharp.dll ../../cairo/cairo-s
references=$(addprefix -r:, $(assemblies)) references=$(addprefix -r:, $(assemblies))
valtest.exe: generated-stamp Valtest.cs $(assemblies) valtest.exe: generated-stamp Valtest.cs $(assemblies)
$(CSC) $(CSFLAGS) -out:valtest.exe $(references) $(srcdir)/Valtest.cs $(GENERATED_SOURCES_OPTION) $(CSC) $(CSFLAGS) -unsafe -out:valtest.exe $(references) $(srcdir)/Valtest.cs $(GENERATED_SOURCES_OPTION)
libvalobj_la_SOURCES = \ libvalobj_la_SOURCES = \
valobj.c \ valobj.c \