From 26230596baf8f31d15fbb996b970ee83932a8853 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Mon, 2 Dec 2024 20:35:33 +0300 Subject: [PATCH] 3rdparty: bzip2: wscript: bring back generating bz_version.h.in now that cmake.py has subst support --- 3rdparty/bzip2/bz_version.h | 1 - 3rdparty/bzip2/wscript | 13 +++---------- 2 files changed, 3 insertions(+), 11 deletions(-) delete mode 100644 3rdparty/bzip2/bz_version.h diff --git a/3rdparty/bzip2/bz_version.h b/3rdparty/bzip2/bz_version.h deleted file mode 100644 index c6484cbd..00000000 --- a/3rdparty/bzip2/bz_version.h +++ /dev/null @@ -1 +0,0 @@ -#define BZ_VERSION "1.1.0-fwgs" diff --git a/3rdparty/bzip2/wscript b/3rdparty/bzip2/wscript index 4d5a785e..6204ca04 100644 --- a/3rdparty/bzip2/wscript +++ b/3rdparty/bzip2/wscript @@ -14,20 +14,13 @@ def configure(conf): conf.define('BZ_UNIX', 1) def build(bld): -# doesn't work with CMake generator -# bld( -# features = 'subst', -# source = 'bzip2/bz_version.h.in', -# target = 'bz_version.h', -# BZ_VERSION='1.1.0-fwgs' -# ) + bld(features = 'subst', source = 'bzip2/bz_version.h.in', target = 'bzip2/bz_version.h', BZ_VERSION='1.1.0-fwgs') bz_sources = ['bzip2/blocksort.c', 'bzip2/huffman.c', 'bzip2/crctable.c', 'bzip2/randtable.c', 'bzip2/compress.c', 'bzip2/decompress.c', 'bzip2/bzlib.c'] bld.stlib( source = bz_sources, target = 'bzip2', -# use = 'bz_version.h', - includes = ['.', 'bzip2/'], - export_includes = ['bzip2/'] + includes = 'bzip2/', + export_includes = 'bzip2/' )