Skip to content
Permalink
Browse files

Fix meson 0.48.0 compat; require >=0.48.0 and recommend >=0.49.0

  • Loading branch information...
Akaricchi committed Sep 29, 2019
1 parent 483a9c4 commit 436339a38dba56a1e9e166d1bc89addc8d6d22ff
Showing with 17 additions and 15 deletions.
  1. +1 −1 README.rst
  2. +9 −3 meson.build
  3. +7 −11 src/meson.build
@@ -35,7 +35,7 @@ Build-only dependencies
^^^^^^^^^^^^^^^^^^^^^^^

- Python >= 3.5
- meson >= 0.45.0 (build system; >=0.48.0 recommended)
- meson >= 0.48.0 (build system; >=0.49.0 recommended)

Optional:

@@ -1,7 +1,7 @@
project('taisei', 'c',
license : 'MIT',
version : 'v1.4-dev',
meson_version : '>=0.45.0',
meson_version : '>=0.48.0',
default_options : [
'c_std=c11',
'default_library=static',
@@ -22,7 +22,7 @@ project('taisei', 'c',
]
)

minimum_recommended_meson_version = '0.48.0'
minimum_recommended_meson_version = '0.49.0'

if meson.version().version_compare('<@0@'.format(minimum_recommended_meson_version))
warning('Old Meson version detected. Try upgrading to at least @0@ if the build fails.'.format(minimum_recommended_meson_version))
@@ -145,7 +145,13 @@ taisei_deps = [
# don't add glad here
]

if dep_webpdecoder.found() and get_option('wrap_mode') != 'forcefallback'
if meson.version().version_compare('<0.49.0')
wrap_mode_forcefallback = false
else
wrap_mode_forcefallback = (get_option('wrap_mode') == 'forcefallback')
endif

if dep_webpdecoder.found() and not wrap_mode_forcefallback
# distro libwebpdecoder
taisei_deps += dep_webpdecoder
else
@@ -35,18 +35,14 @@ if host_machine.system() == 'windows'
output : 'taisei.rc',
)

if meson.version().version_compare('>=0.47.0')
version_deps += winmod.compile_resources(
rc_target,
depend_files : files(
'taisei.manifest',
icon_main,
icon_replay,
)
version_deps += winmod.compile_resources(
rc_target,
depend_files : files(
'taisei.manifest',
icon_main,
icon_replay,
)
else
version_deps += winmod.compile_resources(rc_target)
endif
)

# msvcrt is dumb and only supports up to c89.
# with this defined, alternative implementations from mingw for e.g. the

0 comments on commit 436339a

Please sign in to comment.
You can’t perform that action at this time.