diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-10-14 22:48:36 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-10-14 22:48:36 +0300 |
| commit | cf5cefba0d2b6e76ed9371cfc65329f74f6f1ca4 (patch) | |
| tree | 665784366bcb3ade7c9bae446db22a94e193a110 | |
| parent | a16bea59386b8f10442333f55c8d511ca4b724d6 (diff) | |
| parent | 5cdbec46ea76beff6c98833839ea500fa02e559f (diff) | |
| download | meson-cf5cefba0d2b6e76ed9371cfc65329f74f6f1ca4.zip meson-cf5cefba0d2b6e76ed9371cfc65329f74f6f1ca4.tar.gz meson-cf5cefba0d2b6e76ed9371cfc65329f74f6f1ca4.tar.bz2 | |
Merge pull request #279 from ieei/fixup-manual_test_4
Replace host.name() with host_machine.system().
| -rw-r--r-- | authors.txt | 1 | ||||
| -rw-r--r-- | manual tests/4 standalone binaries/meson.build | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/authors.txt b/authors.txt index e32bd28..fe479bf 100644 --- a/authors.txt +++ b/authors.txt @@ -22,3 +22,4 @@ Rafaël Kooi Marko Raatikainen German Diago Gomez Kyle Manna +Haakon Sporsheim 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'] |