3rdparty: wscript: set explicit names for correct dependency calc of generated files
This helps avoid issue when the bzip2 or libogg are compiled before header is generated for them. In theory, we shouldn't do that, but I guess dependency calculation through include directives doesn't work when the file doesn't exist.
This commit is contained in:
parent
26230596ba
commit
0181e640c9
2 changed files with 4 additions and 1 deletions
3
3rdparty/bzip2/wscript
vendored
3
3rdparty/bzip2/wscript
vendored
|
@ -14,13 +14,14 @@ def configure(conf):
|
|||
conf.define('BZ_UNIX', 1)
|
||||
|
||||
def build(bld):
|
||||
bld(features = 'subst', source = 'bzip2/bz_version.h.in', target = 'bzip2/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', name = 'bz_version')
|
||||
|
||||
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',
|
||||
includes = 'bzip2/',
|
||||
export_includes = 'bzip2/'
|
||||
)
|
||||
|
|
2
3rdparty/libogg/wscript
vendored
2
3rdparty/libogg/wscript
vendored
|
@ -31,6 +31,7 @@ def build(bld):
|
|||
|
||||
bld(
|
||||
features = 'subst',
|
||||
name = 'libogg_config_types',
|
||||
source = 'libogg/include/ogg/config_types.h.in',
|
||||
target = 'libogg/include/ogg/config_types.h',
|
||||
INCLUDE_INTTYPES_H = bld.env.INCLUDE_INTTYPES_H,
|
||||
|
@ -47,6 +48,7 @@ def build(bld):
|
|||
bld.stlib(
|
||||
source = sources,
|
||||
target = 'libogg',
|
||||
use = 'libogg_config_types',
|
||||
includes = ['libogg/include/'],
|
||||
export_includes = ['libogg/include/']
|
||||
)
|
||||
|
|
Loading…
Add table
Reference in a new issue