summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/wscript14
-rw-r--r--libs/audiographer/wscript4
-rw-r--r--libs/evoral/wscript2
-rw-r--r--libs/gnomecanvas/wscript4
-rw-r--r--libs/gtkmm2ext/wscript4
-rw-r--r--libs/pbd/wscript4
-rw-r--r--libs/surfaces/wscript16
7 files changed, 25 insertions, 23 deletions
diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 4007ab9d20..29948e3555 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -391,22 +391,22 @@ def build(bld):
'uri_map.cc', 'rdff.c' ]
obj.uselib += ['SLV2','RASQAL']
- if bld.env['VST_SUPPORT']:
+ if bld.is_defined('VST_SUPPORT'):
obj.source += [ 'vst_plugin.cc', 'session_vst.cc' ]
obj.includes += [ '../fst' ]
obj.defines += [ 'VST_SUPPORT' ]
- if bld.env['LXVST_SUPPORT']:
+ if bld.is_defined('LXVST_SUPPORT'):
obj.source += [ 'lxvst_plugin.cc', 'session_lxvst.cc', 'vstfx.cc', 'vstfxwin.cc', 'vstfxinfofile.cc' ]
obj.defines += [ 'LXVST_SUPPORT' ]
- if bld.env['COREAUDIO']:
+ if bld.is_defined('COREAUDIO'):
obj.source += [ 'coreaudiosource.cc', 'caimportable.cc' ]
obj.use += ['libappleutility']
obj.source += [ 'audio_unit.cc' ]
- if bld.env['FPU_OPTIMIZATION']:
+ if bld.is_defined('FPU_OPTIMIZATION'):
if (bld.env['build_target'] == 'i386'
or bld.env['build_target'] == 'i686'):
obj.source += [ 'sse_functions_xmm.cc', 'sse_functions.s' ]
@@ -414,7 +414,7 @@ def build(bld):
obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit.s' ]
# i18n
- if bld.env['ENABLE_NLS']:
+ if bld.is_defined('ENABLE_NLS'):
mo_files = bld.path.ant_glob('po/*.mo')
for mo in mo_files:
lang = os.path.basename(mo).replace('.mo', '')
@@ -422,7 +422,7 @@ def build(bld):
lang, 'LC_MESSAGES', 'libardour3.mo'),
mo)
- if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
+ if bld.is_defined('BUILD_TESTS') and bld.is_defined('HAVE_CPPUNIT'):
# Unit tests
testobj = bld(features = 'cxx cxxprogram')
testobj.source = '''
@@ -450,7 +450,7 @@ def build(bld):
'VAMP_DIR="' + os.path.join(
os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"'
]
- if bld.env['FPU_OPTIMIZATION']:
+ if bld.is_defined('FPU_OPTIMIZATION'):
testobj.source += [ 'sse_functions_xmm.cc' ]
if (bld.env['build_target'] == 'i386'
or bld.env['build_target'] == 'i686'):
diff --git a/libs/audiographer/wscript b/libs/audiographer/wscript
index 172f3b13b7..14ddcd3d3c 100644
--- a/libs/audiographer/wscript
+++ b/libs/audiographer/wscript
@@ -78,7 +78,7 @@ def build(bld):
audiographer.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
- if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
+ if bld.is_defined('BUILD_TESTS') and bld.is_defined('HAVE_CPPUNIT'):
# Unit tests
obj = bld(features = 'cxx cxxprogram')
obj.source = '''
@@ -95,7 +95,7 @@ def build(bld):
tests/general/silence_trimmer_test.cc
'''
- if bld.env['HAVE_ALL_GTHREAD']:
+ if bld.is_defined('HAVE_ALL_GTHREAD'):
obj.source += '''
tests/general/threader_test.cc
'''
diff --git a/libs/evoral/wscript b/libs/evoral/wscript
index a98573a68b..314fe2a2f0 100644
--- a/libs/evoral/wscript
+++ b/libs/evoral/wscript
@@ -97,7 +97,7 @@ def build(bld):
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
obj.defines = ['PACKAGE="libevoral"' ]
- if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
+ if bld.is_defined('BUILD_TESTS') and bld.is_defined('HAVE_CPPUNIT'):
# Static library (for unit test code coverage)
obj = bld(features = 'cxx cstlib')
obj.source = lib_source
diff --git a/libs/gnomecanvas/wscript b/libs/gnomecanvas/wscript
index 0ab45977b9..f5d444f008 100644
--- a/libs/gnomecanvas/wscript
+++ b/libs/gnomecanvas/wscript
@@ -49,6 +49,8 @@ def configure(conf):
autowaf.configure(conf)
autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK', atleast_version='2.18')
autowaf.check_pkg(conf, 'libart-2.0', uselib_store='LIBART', atleast_version='2.3')
+ autowaf.check_pkg(conf, 'pango', uselib_store='PANGO', atleast_version='1.28')
+ autowaf.check_pkg(conf, 'pangoft2', uselib_store='PANGOFT2', atleast_version='1.28')
def build(bld):
# Library
@@ -58,7 +60,7 @@ def build(bld):
obj.includes = ['.']
obj.name = 'libgnomecanvas-2'
obj.target = 'gnomecanvas-2'
- obj.uselib = 'GLIB GTK LIBART'
+ obj.uselib = 'GLIB GTK LIBART PANGO PANGOFT2'
obj.vnum = LIBGNOMECANVAS_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index 64f19e2d02..a07b33e8fe 100644
--- a/libs/gtkmm2ext/wscript
+++ b/libs/gtkmm2ext/wscript
@@ -91,13 +91,13 @@ def build(bld):
'-DPACKAGE="libgtkmm2ext"',
'-DLOCALEDIR="' + os.path.join(
os.path.normpath(bld.env['DATADIR']), 'locale') + '"']
- if bld.env['GTKOSX']:
+ if bld.is_defined('GTKOSX'):
obj.source += ['gtkapplication_quartz.mm']
else:
obj.source += ['gtkapplication_x11.c']
# i18n
- if bld.env['ENABLE_NLS']:
+ if bld.is_defined('ENABLE_NLS'):
mo_files = bld.path.ant_glob ('po/*.mo')
for mo in mo_files:
lang = os.path.basename (mo).replace ('.mo', '')
diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index 729aa7ead1..577e902532 100644
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -108,7 +108,7 @@ def build(bld):
xml++.cc
'''
- if bld.env['DEBUG_RT_ALLOC']:
+ if bld.is_defined('DEBUG_RT_ALLOC'):
obj.source += 'debug_rt_alloc.c'
obj.export_includes = ['.']
@@ -127,7 +127,7 @@ def build(bld):
if bld.env['build_target'] == 'x86_64':
obj.cxxflags += [ '-DUSE_X86_64_ASM' ]
- if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
+ if bld.is_defined ('BUILD_TESTS') and bld.is_defined('HAVE_CPPUNIT'):
# Unit tests
testobj = bld(features = 'cxx cxxprogram')
testobj.source = '''
diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript
index 6635a443e1..8bd59f5daf 100644
--- a/libs/surfaces/wscript
+++ b/libs/surfaces/wscript
@@ -67,14 +67,14 @@ def build(bld):
bld.recurse('control_protocol')
bld.recurse('generic_midi')
bld.recurse('mackie')
- if bld.env['BUILD_OSC']:
- bld.add_subdirs('osc')
- if bld.env['BUILD_POWERMATE']:
- bld.add_subdirs('powermate')
- if bld.env['BUILD_WIIMOTE']:
- bld.add_subdirs('wiimote')
- if bld.env['BUILD_TRANZPORT']:
- bld.add_subdirs('tranzport')
+ if bld.is_defined ('BUILD_OSC'):
+ bld.recurse('osc')
+ if bld.is_defined('BUILD_POWERMATE'):
+ bld.recurse('powermate')
+ if bld.is_defined('BUILD_WIIMOTE'):
+ bld.recurse('wiimote')
+ if bld.is_defined('BUILD_TRANZPORT'):
+ bld.recurse('tranzport')
def shutdown():
autowaf.shutdown()
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-01 18:48:43 +0000