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

Make sure to run exes within mono if required

Browse source
This commit is contained in:
Thibault Saunier 2017-09-25 11:56:16 -03:00
parent 58001e6fc8
commit 0f58e7e253
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Source/gio/generated/generate_code.py
View file

@ -37,12 +37,17 @@ if __name__ == "__main__":
shutil.copyfile(opts.api_raw, api_xml) shutil.copyfile(opts.api_raw, api_xml)
if shutil.which('mono'):
launcher = ['mono']
else:
launcher = []
cmd = [opts.gapi_fixup, "--api=" + api_xml] cmd = [opts.gapi_fixup, "--api=" + api_xml]
if opts.metadata: if opts.metadata:
cmd += ["--metadata=" + opts.metadata] cmd += ["--metadata=" + opts.metadata]
if opts.symbols: if opts.symbols:
cmd.extend(['--symbols=' + opts.symbols]) cmd.extend(['--symbols=' + opts.symbols])
subprocess.check_call(cmd) subprocess.check_call(launcher + cmd)
cmd = [ cmd = [
opts.gapi_codegen, '--generate', api_xml, opts.gapi_codegen, '--generate', api_xml,
@ -57,8 +62,7 @@ if __name__ == "__main__":
cmd += ['-I' + i for i in opts.extra_includes] cmd += ['-I' + i for i in opts.extra_includes]
print(' '.join(cmd)) subprocess.check_call(launcher + cmd)
subprocess.check_call(cmd)
# WORKAROUND: Moving files into the out directory with special names # WORKAROUND: Moving files into the out directory with special names
# as meson doesn't like path separator in output names. # as meson doesn't like path separator in output names.

2
Source/meson.build
View file

@ -30,7 +30,7 @@ if csc.get_id() == 'mono'
endif endif
add_project_arguments('-keyfile:' + join_paths(meson.current_source_dir(), 'gtk-sharp.snk'), add_project_arguments('-keyfile:' + join_paths(meson.current_source_dir(), 'gtk-sharp.snk'),
languages: ['cs']) language: ['cs'])
endif endif
install = get_option('install') install = get_option('install')