diff options
author | Haakon Sporsheim <haakon.sporsheim@gmail.com> | 2015-10-13 14:56:05 +0200 |
---|---|---|
committer | Haakon Sporsheim <haakon.sporsheim@gmail.com> | 2015-10-13 14:56:05 +0200 |
commit | 7ec9b50f8ecc0905a1ec6432f5452a06f0456d51 (patch) | |
tree | 3f2fbe3b27bb0661e491bcad027068d61d9b462c /manual tests | |
parent | d952812b1bddd2e4a7c0dd60da5ac17757182cee (diff) | |
download | meson-7ec9b50f8ecc0905a1ec6432f5452a06f0456d51.zip meson-7ec9b50f8ecc0905a1ec6432f5452a06f0456d51.tar.gz meson-7ec9b50f8ecc0905a1ec6432f5452a06f0456d51.tar.bz2 |
Fix manual tests using host.name()
Diffstat (limited to 'manual tests')
-rw-r--r-- | manual tests/4 standalone binaries/meson.build | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/manual tests/4 standalone binaries/meson.build b/manual tests/4 standalone binaries/meson.build index b524873..baae796 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'] |