Commit be540ff4 authored by Federico Mena Quintero's avatar Federico Mena Quintero

Merge branch 'windows-fixes' into 'master'

Misc fixes

See merge request !14
parents 772dc4d0 6b3d675f
Pipeline #65279219 passed with stage
in 4 minutes and 47 seconds
......@@ -81,6 +81,9 @@ typedef
/* windows.h define small to char */
# undef small
# endif
# ifndef WINAPI
# define WINAPI
# endif
# ifdef BZ_EXPORT
# define BZ_API(func) WINAPI func
# define BZ_EXTERN extern
......
LIBRARY LIBBZ2
DESCRIPTION "libbzip2: library for data compression"
LIBRARY bz2-1
DESCRIPTION "bz2: library for data compression"
EXPORTS
BZ2_bzCompressInit
BZ2_bzCompress
......
......@@ -24,14 +24,27 @@ if cc.has_function_attribute('visibility')
c_args += '-DBZ_EXTERN=__attribute__((__visibility__("default")))'
endif
libbzip2 = library(
'bzip2',
['blocksort.c', 'huffman.c', 'crctable.c', 'randtable.c', 'compress.c', 'decompress.c', 'bzlib.c'],
c_args : c_args,
gnu_symbol_visibility : 'hidden',
version : meson.project_version(),
install : true,
)
bz_sources = ['blocksort.c', 'huffman.c', 'crctable.c', 'randtable.c', 'compress.c', 'decompress.c', 'bzlib.c']
if ['msvc', 'clang-cl', 'intel-cl'].contains(cc.get_id())
libbzip2 = library(
'bz2',
bz_sources,
c_args : c_args,
vs_module_defs : 'libbz2.def',
version : meson.project_version(),
install : true,
)
else
libbzip2 = library(
'bz2',
bz_sources,
c_args : c_args,
gnu_symbol_visibility : 'hidden',
version : meson.project_version(),
install : true,
)
endif
bzip2 = executable(
'bzip2',
......@@ -66,4 +79,4 @@ install_headers('bzlib.h')
subdir('man')
subdir('docs')
subdir('tests')
\ No newline at end of file
subdir('tests')
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment