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

Merge pull request #25 from thiblahute/master

Browse source 
Fix path separators on windows
This commit is contained in:
Chris Lapa 2017-10-06 23:04:00 +11:00 committed by GitHub
parent 90187fd8c1 af0c5ccc63
commit 604742fa16
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Source/meson.build
View file

@ -80,9 +80,15 @@ gapi_xml_installdir = join_paths(get_option('datadir'), 'gapi-3.0')
schema = join_paths(meson.current_source_dir(), 'gapi.xsd') schema = join_paths(meson.current_source_dir(), 'gapi.xsd')
if host_machine.system() == 'windows'
pathsep = ';'
else
pathsep = ':'
endif
mono_path = '' mono_path = ''
foreach d: [ 'glib', 'gio' ] foreach d: [ 'glib', 'gio' ]
mono_path += ':' + join_paths(meson.current_build_dir(), d) mono_path += pathsep + join_paths(meson.current_build_dir(), d)
endforeach endforeach
subdir('parser') subdir('parser')
@ -92,7 +98,7 @@ subdir('gio')
cairo_dep = dependency('cairo', required: false) cairo_dep = dependency('cairo', required: false)
if cairo_dep.found() if cairo_dep.found()
mono_path += ':' + join_paths(meson.current_build_dir(), 'cairo') mono_path += pathsep + join_paths(meson.current_build_dir(), 'cairo')
subdir('cairo') subdir('cairo')
else else
message('Cairo not found, not building') message('Cairo not found, not building')
@ -100,7 +106,7 @@ endif
pango_dep = dependency('pango', required: false) pango_dep = dependency('pango', required: false)
if pango_dep.found() if pango_dep.found()
mono_path += ':' + join_paths(meson.current_build_dir(), 'pango') mono_path += pathsep + join_paths(meson.current_build_dir(), 'pango')
subdir('pango') subdir('pango')
else else
message('Pango not found, not building') message('Pango not found, not building')
@ -108,7 +114,7 @@ endif
atk_dep = dependency('atk', required: false) atk_dep = dependency('atk', required: false)
if atk_dep.found() if atk_dep.found()
mono_path += ':' + join_paths(meson.current_build_dir(), 'atk') mono_path += pathsep + join_paths(meson.current_build_dir(), 'atk')
subdir('atk') subdir('atk')
else else
message('Atk not found, not building') message('Atk not found, not building')
@ -116,7 +122,7 @@ endif
gdk_dep = dependency('gdk-3.0', version: gtk_required_version, required: false) gdk_dep = dependency('gdk-3.0', version: gtk_required_version, required: false)
if gdk_dep.found() and atk_dep.found() and pango_dep.found() if gdk_dep.found() and atk_dep.found() and pango_dep.found()
mono_path += ':' + join_paths(meson.current_build_dir(), 'gdk') mono_path += pathsep + join_paths(meson.current_build_dir(), 'gdk')
subdir('gdk') subdir('gdk')
has_gdk = true has_gdk = true
else else
@ -126,7 +132,7 @@ endif
gtk_dep = dependency('gtk+-3.0', version: gtk_required_version, required: false) gtk_dep = dependency('gtk+-3.0', version: gtk_required_version, required: false)
if gtk_dep.found() and atk_dep.found() and pango_dep.found() if gtk_dep.found() and atk_dep.found() and pango_dep.found()
mono_path += ':' + join_paths(meson.current_build_dir(), 'gtk') mono_path += pathsep + join_paths(meson.current_build_dir(), 'gtk')
subdir('gtk') subdir('gtk')
subdir('sample/GtkDemo') subdir('sample/GtkDemo')
subdir('sample/valtest') subdir('sample/valtest')
@ -151,7 +157,7 @@ foreach nugetinfo: nuget_infos
'--builddir', meson.current_build_dir()] '--builddir', meson.current_build_dir()]
foreach dep: nugetinfo[2] foreach dep: nugetinfo[2]
cmd += ['--dependency=' + dep + ':' + version] cmd += ['--dependency=' + dep + pathsep + version]
endforeach endforeach
deps += [custom_target(nugetinfo[0] + '-nugget', command: cmd, deps += [custom_target(nugetinfo[0] + '-nugget', command: cmd,