wscript: handle libs/clearlooks-newer like all other children
Put it in the "children" list instead of recursing explicitly. The only difference is that the (empty) options function in libs/clearlooks-newer/wscript now will be invoked - before it wasn't.
This commit is contained in:
parent
8fea606b32
commit
e1b9c8c4d9
5
wscript
5
wscript
@ -299,6 +299,7 @@ top = '.'
|
|||||||
out = 'build'
|
out = 'build'
|
||||||
|
|
||||||
children = [
|
children = [
|
||||||
|
'libs/clearlooks-newer',
|
||||||
# optionally external libraries
|
# optionally external libraries
|
||||||
'libs/fluidsynth',
|
'libs/fluidsynth',
|
||||||
'libs/hidapi',
|
'libs/hidapi',
|
||||||
@ -1479,8 +1480,6 @@ int main () { __int128 x = 0; return 0; }
|
|||||||
if not (Options.options.dist_target == 'mingw' or Options.options.dist_target == 'msvc'):
|
if not (Options.options.dist_target == 'mingw' or Options.options.dist_target == 'msvc'):
|
||||||
conf.env.append_value('LIB', 'm')
|
conf.env.append_value('LIB', 'm')
|
||||||
|
|
||||||
sub_config_and_use(conf, 'libs/clearlooks-newer')
|
|
||||||
|
|
||||||
for i in children:
|
for i in children:
|
||||||
sub_config_and_use(conf, i)
|
sub_config_and_use(conf, i)
|
||||||
|
|
||||||
@ -1638,8 +1637,6 @@ def build(bld):
|
|||||||
obj.chmod = Utils.O755
|
obj.chmod = Utils.O755
|
||||||
obj.install_path = bld.env['LIBDIR']
|
obj.install_path = bld.env['LIBDIR']
|
||||||
|
|
||||||
bld.recurse('libs/clearlooks-newer')
|
|
||||||
|
|
||||||
for i in children:
|
for i in children:
|
||||||
bld.recurse(i)
|
bld.recurse(i)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user