From 7ec9b50f8ecc0905a1ec6432f5452a06f0456d51 Mon Sep 17 00:00:00 2001 From: Haakon Sporsheim Date: Tue, 13 Oct 2015 14:56:05 +0200 Subject: [PATCH 1/2] Fix manual tests using host.name() --- manual tests/4 standalone binaries/meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manual tests/4 standalone binaries/meson.build b/manual tests/4 standalone binaries/meson.build index b52487318..baae796ac 100644 --- a/manual tests/4 standalone binaries/meson.build +++ b/manual tests/4 standalone binaries/meson.build @@ -1,12 +1,12 @@ project('myapp', 'cpp') -sdl = dependency('sdl2', required : host.name() != 'windows') +sdl = dependency('sdl2', required : host_machine.system() != 'windows') if meson.get_compiler('cpp').get_id() != 'msvc' add_global_arguments('-std=c++11', language : 'cpp') endif -if host.name() == 'darwin' +if host_machine.system() == 'darwin' install_data('myapp.sh', install_dir : 'Contents/MacOS') @@ -19,14 +19,14 @@ if host.name() == 'darwin' meson.set_install_script('osx_bundler.sh') endif -if host.name() == 'linux' +if host_machine.system() == 'linux' install_data('myapp.sh', install_dir : '.') meson.set_install_script('linux_bundler.sh') endif extra_link_args = [] -if host.name() == 'windows' +if host_machine.system() == 'windows' str = '-I@0@/@1@'.format(meson.current_build_dir(), 'SDL2-2.0.3/include') add_global_arguments(str, language : 'cpp') extra_link_args = ['/SUBSYSTEM:CONSOLE', 'SDL2main.lib', 'SDL2.lib'] From 5cdbec46ea76beff6c98833839ea500fa02e559f Mon Sep 17 00:00:00 2001 From: Haakon Sporsheim Date: Wed, 14 Oct 2015 21:32:49 +0200 Subject: [PATCH 2/2] Add Haakon Sporsheim to authors. --- authors.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/authors.txt b/authors.txt index e32bd28ad..fe479bfc5 100644 --- a/authors.txt +++ b/authors.txt @@ -22,3 +22,4 @@ Rafaël Kooi Marko Raatikainen German Diago Gomez Kyle Manna +Haakon Sporsheim