diff options
Diffstat (limited to 'libz/libz/buildfile')
| -rw-r--r-- | libz/libz/buildfile | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/libz/libz/buildfile b/libz/libz/buildfile index 32d97e4..0103711 100644 --- a/libz/libz/buildfile +++ b/libz/libz/buildfile @@ -1,7 +1,7 @@ # file : libz/buildfile # license : zlib License; see accompanying LICENSE file -lib{z}: {h c}{*} def{zlib} +lib{z}: {h c}{* -zconf} h{zconf} tclass = $c.target.class tsys = $c.target.system @@ -10,7 +10,8 @@ linux = ($tclass == 'linux') bsd = ($tclass == 'bsd') windows = ($tclass == 'windows') -lib{z}: file{zlib.map}: include = ($linux || $bsd ? adhoc : false) +libs{z}: file{zlib.map}: include = ($linux || $bsd ? adhoc : false) +libs{z}: def{zlib}: include = $windows # Include the generated config header into the distribution (so that we don't # pick up an installed one) and don't remove it when cleaning in src (so that @@ -47,7 +48,7 @@ switch $tclass, $tsys # c.poptions =+ "-I$out_base" "-I$src_base" -switch $c.class, $tsys +switch $c.class { case 'gcc' { @@ -56,8 +57,13 @@ switch $c.class, $tsys # way that works across compilers/version (some -Wno-* options are only # recognized in newer versions). # + # @@ TMP: try to re-enable on next release. + # c.coptions += -Wno-all -Wno-extra + if ($c.id.type == 'clang' && $c.version.major >= 15) + c.coptions += -Wno-deprecated-non-prototype + # Disable the Clang targeting MSVC warnings. # if ($c.id == 'clang' && $tsys == 'win32-msvc') @@ -67,7 +73,7 @@ switch $c.class, $tsys { # Disable warnings that pop up with /W3. # - c.coptions += /wd4267 + c.coptions += /wd4244 /wd4267 } } @@ -96,7 +102,6 @@ else # Install the bare minimum of headers (note: not recreating subdirectories). # -h{*}: install = false - -for h: zconf zlib - h{$h}@./: install = include/ +h{*}: install = false +h{zconf}: install = include/ +h{zlib}@./: install = include/ |