Merge pull request #4 from jpakkane/1.2.8

Updated definitions to new Meson release.
mesonbuild · Dec 17, 2015 · 061de85 · 061de85
2 parents 570fb09 + 083d88d
commit 061de85
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/meson.build b/meson.build
@@ -1,13 +1,9 @@
-project('zlib', 'c')
+project('zlib', 'c', version : '1.2.8', license : 'zlib')
 
 src = ['adler32.c', 'crc32.c', 'deflate.c', 'infback.c', 'inffast.c', 'inflate.c',
 'inftrees.c', 'trees.c', 'zutil.c',
 'compress.c', 'uncompr.c', 'gzclose.c', 'gzlib.c', 'gzread.c', 'gzwrite.c']
 
-if get_option('shared_lib')
-  zlib = shared_library('z', src)
-else
-  zlib = static_library('z', src)
-endif
+zlib = library('z', src)
 
 incdir = include_directories('.')
diff --git a/meson_options.txt b/meson_options.txt