ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Initial support for Windows build

Browse Source
This commit is contained in:
Lzu Tao
2018-12-01 23:18:59 +07:00
parent 2337429e8d
commit 0a0683f5b2
6 changed files with 269 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/meson/contrib/gen_html/meson.build
+14 -18
View File
@@ -7,27 +7,23 @@
# in the COPYING file in the root directory of this source tree).
# #############################################################################
zstd_source_dir = join_paths('..', '..', '..', '..')
library_dir = join_paths(zstd_source_dir, 'lib')
library_common_dir = join_paths(library_dir, 'common')
programs_dir = join_paths(zstd_source_dir, 'programs')
contrib_gen_html_dir = join_paths(zstd_source_dir, 'contrib', 'gen_html')
zstd_rootdir = '../../../..'
gen_html_includes = include_directories(programs_dir,
library_dir,
library_common_dir,
contrib_gen_html_dir)
gen_html_includes = include_directories(join_paths(zstd_rootdir, 'programs'),
join_paths(zstd_rootdir, 'lib'),
join_paths(zstd_rootdir, 'lib/common'),
join_paths(zstd_rootdir, 'contrib/gen_html'))
gen_html = executable('gen_html',
join_paths(contrib_gen_html_dir, 'gen_html.cpp'),
include_directories: gen_html_includes,
install: false)
join_paths(zstd_rootdir, 'contrib/gen_html/gen_html.cpp'),
include_directories: gen_html_includes,
install: false)
# Update zstd manual
zstd_manual_html = custom_target('zstd_manual.html',
output : 'zstd_manual.html',
command : [gen_html,
zstd_version,
join_paths(meson.current_source_dir(), library_dir, 'zstd.h'),
'@OUTPUT@'],
install : false)
output : 'zstd_manual.html',
command : [gen_html,
zstd_version,
join_paths(meson.current_source_dir(), join_paths(zstd_rootdir, 'lib/zstd.h')),
'@OUTPUT@'],
install : false)
build/meson/contrib/pzstd/meson.build
+13 -21
View File
@@ -7,26 +7,18 @@
# in the COPYING file in the root directory of this source tree).
# #############################################################################
zstd_source_dir = join_paths('..', '..', '..', '..')
library_dir = join_paths(zstd_source_dir, 'lib')
library_common_dir = join_paths(library_dir, 'common')
programs_dir = join_paths(zstd_source_dir, 'programs')
contrib_pzstd_dir = join_paths(zstd_source_dir, 'contrib', 'pzstd')
pzstd_includes = include_directories(programs_dir,
library_dir,
library_common_dir,
contrib_pzstd_dir)
pzstd_sources = [join_paths(programs_dir, 'util.c'),
join_paths(contrib_pzstd_dir, 'main.cpp'),
join_paths(contrib_pzstd_dir, 'Options.cpp'),
join_paths(contrib_pzstd_dir, 'Pzstd.cpp'),
join_paths(contrib_pzstd_dir, 'SkippableFrame.cpp')]
zstd_rootdir = '../../../..'
pzstd_includes = include_directories(join_paths(zstd_rootdir, 'programs'),
join_paths(zstd_rootdir, 'contrib/pzstd'))
pzstd_sources = [join_paths(zstd_rootdir, 'programs/util.c'),
join_paths(zstd_rootdir, 'contrib/pzstd/main.cpp'),
join_paths(zstd_rootdir, 'contrib/pzstd/Options.cpp'),
join_paths(zstd_rootdir, 'contrib/pzstd/Pzstd.cpp'),
join_paths(zstd_rootdir, 'contrib/pzstd/SkippableFrame.cpp')]
pzstd = executable('pzstd',
pzstd_sources,
cpp_args: [ '-DNDEBUG', '-Wno-shadow', '-pedantic' ],
include_directories: pzstd_includes,
link_with: libzstd,
dependencies: [ thread_dep ],
install: true)
pzstd_sources,
cpp_args: [ '-DNDEBUG', '-Wno-shadow', '-pedantic' ],
include_directories: pzstd_includes,
dependencies: [ libzstd_dep, thread_dep ],
install: true)