ardour/livetrax
13
0
Fork 0
Code

wscript: don't add pointless -DHAVE_X for each mandatory subdir

Browse Source 
The sub_config_and_use function recursed, but it also invoked
autowaf.set_local_lib , which however didn't do anything useful. The
HAVE_ defines are not used anywhere, and the AUTOWAF_LOCAL defines are
only used in autowaf.use_lib, which however isn't used anywhere.

Dropping these defines simplify the build environment and makes the
compiler command line half as long and thus makes debugging much more
manageable.
This commit is contained in:
Mads Kiilerich 2022-01-27 21:49:21 +01:00 committed by Paul Davis
parent e1b9c8c4d9
commit 2bb311f99b
4 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/backends/wscript
View File

@ -4,16 +4,12 @@ from waflib.extras import autowaf as autowaf
def options(opt):
pass
def sub_config_and_use(conf, name, has_objects = True):
conf.recurse(name)
autowaf.set_local_lib(conf, name, has_objects)
def configure(conf):
autowaf.set_recursive()
backends = conf.env['BACKENDS']
for i in backends:
sub_config_and_use(conf, i)
conf.recurse(i)
def build(bld):
backends = bld.env['BACKENDS']

6
libs/panners/wscript
View File

@ -4,17 +4,13 @@ from waflib.extras import autowaf as autowaf
def options(opt):
pass
def sub_config_and_use(conf, name, has_objects = True):
conf.recurse(name)
autowaf.set_local_lib(conf, name, has_objects)
def configure(conf):
autowaf.set_recursive()
panners = [ '2in2out', '1in2out', 'vbap', 'stereobalance' ]
for i in panners:
sub_config_and_use(conf, i)
conf.recurse(i)
def build(bld):
panners = [ '2in2out', '1in2out', 'vbap', 'stereobalance' ]

6
libs/surfaces/wscript
View File

@ -27,10 +27,6 @@ children = [
def options(opt):
pass
def sub_config_and_use(conf, name, has_objects = True):
conf.recurse(name)
autowaf.set_local_lib(conf, name, has_objects)
def configure(conf):
global children
@ -70,7 +66,7 @@ def configure(conf):
children += [ 'websockets' ]
for i in children:
sub_config_and_use(conf, i)
conf.recurse(i)
def build(bld):
bld.recurse('generic_midi')

2
wscript
View File

@ -1481,7 +1481,7 @@ int main () { __int128 x = 0; return 0; }
conf.env.append_value('LIB', 'm')
for i in children:
sub_config_and_use(conf, i)
conf.recurse(i)
# Fix utterly braindead FLAC include path to not smash assert.h
conf.env['INCLUDES_FLAC'] = []