Skip to content

Commit

Permalink
Merge pull request #3 from ignatenkobrain/1.2.8
Browse files Browse the repository at this point in the history
Can build both either as shared or static.
  • Loading branch information
ignatenkobrain committed May 29, 2015
2 parents 1ff2fb8 + 1d445b8 commit 570fb09
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
11 changes: 8 additions & 3 deletions meson.build
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
project('zlib', 'c')

zlib = static_library('z',
'adler32.c', 'crc32.c', 'deflate.c', 'infback.c', 'inffast.c', 'inflate.c',
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')
'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

incdir = include_directories('.')
1 change: 1 addition & 0 deletions meson_options.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
option('shared_lib', type : 'boolean', value : false)
1 change: 0 additions & 1 deletion upstream.wrap
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ directory = zlib-1.2.8
source_url = http://zlib.net/zlib-1.2.8.tar.gz
source_filename = zlib-1.2.8.tar.gz
source_hash = 36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d

0 comments on commit 570fb09

Please sign in to comment.