Merge pull request #279 from ieei/fixup-manual_test_4

Replace host.name() with host_machine.system().
pull/282/head
Jussi Pakkanen 9 years ago
commit cf5cefba0d
  1. 1
      authors.txt
  2. 8
      manual tests/4 standalone binaries/meson.build

@ -22,3 +22,4 @@ Rafaël Kooi
Marko Raatikainen Marko Raatikainen
German Diago Gomez German Diago Gomez
Kyle Manna Kyle Manna
Haakon Sporsheim

@ -1,12 +1,12 @@
project('myapp', 'cpp') 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' if meson.get_compiler('cpp').get_id() != 'msvc'
add_global_arguments('-std=c++11', language : 'cpp') add_global_arguments('-std=c++11', language : 'cpp')
endif endif
if host.name() == 'darwin' if host_machine.system() == 'darwin'
install_data('myapp.sh', install_data('myapp.sh',
install_dir : 'Contents/MacOS') install_dir : 'Contents/MacOS')
@ -19,14 +19,14 @@ if host.name() == 'darwin'
meson.set_install_script('osx_bundler.sh') meson.set_install_script('osx_bundler.sh')
endif endif
if host.name() == 'linux' if host_machine.system() == 'linux'
install_data('myapp.sh', install_dir : '.') install_data('myapp.sh', install_dir : '.')
meson.set_install_script('linux_bundler.sh') meson.set_install_script('linux_bundler.sh')
endif endif
extra_link_args = [] 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') str = '-I@0@/@1@'.format(meson.current_build_dir(), 'SDL2-2.0.3/include')
add_global_arguments(str, language : 'cpp') add_global_arguments(str, language : 'cpp')
extra_link_args = ['/SUBSYSTEM:CONSOLE', 'SDL2main.lib', 'SDL2.lib'] extra_link_args = ['/SUBSYSTEM:CONSOLE', 'SDL2main.lib', 'SDL2.lib']

Loading…
Cancel
Save