diff --git a/meson.build b/meson.build index d22d3d1..6dffb46 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ # liblzma is what upstream uses for their pkg-config name -project('liblzma', 'c') +project('liblzma', 'c', version : '5.2.1', license : 'pd/lgpl2/gpl2/gpl3') cc = meson.get_compiler('c') cdata = configuration_data() @@ -76,11 +76,6 @@ configure_file(input : 'config.h.meson', configuration : cdata ) -if get_option('shared_lib') - libtype = 'shared_library' -else - libtype = 'static_library' -endif - confinc = include_directories('.') subdir('src') + diff --git a/meson_options.txt b/meson_options.txt index 4c1cdc0..a161951 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,5 +1,3 @@ -option('shared_lib', type : 'boolean', value : false) - option('decoder_arm', type : 'boolean', value : false) option('decoder_armthumb', type : 'boolean', value : false) option('decoder_delta', type : 'boolean', value : true) diff --git a/src/liblzma/meson.build b/src/liblzma/meson.build index ccf614a..50fc9b5 100644 --- a/src/liblzma/meson.build +++ b/src/liblzma/meson.build @@ -121,11 +121,10 @@ endif lzmainc = include_directories('api', 'common', 'check', 'lz', 'rangecoder', 'lzma', 'delta', 'simple', '../common') -liblzma = build_target('lzma', lzma_sources, +liblzma = library('lzma', lzma_sources, main_dec_sources, main_enc_sources, check_sources, simplefilter_sources, lzma1_sources, lz_sources, delta_sources, include_directories : [confinc, lzmainc], c_args : ['-DHAVE_CONFIG_H', '-DTUKLIB_SYMBOL_PREFIX=lzma_'], - target_type : libtype, )