diff options
| -rw-r--r-- | cfgtool/wscript | 2 | ||||
| -rw-r--r-- | gtk2_ardour/wscript | 30 | ||||
| -rw-r--r-- | libs/ardour/wscript | 10 | ||||
| -rw-r--r-- | wscript | 22 |
4 files changed, 32 insertions, 32 deletions
diff --git a/cfgtool/wscript b/cfgtool/wscript index e5166eb5dc..04dda4f183 100644 --- a/cfgtool/wscript +++ b/cfgtool/wscript @@ -14,7 +14,7 @@ def configure(conf): def build(bld): if bld.env['build_target'] == 'mingw': - return; + return; obj = bld (features = 'cxx c cxxprogram') obj.source = 'cfgtool.cc' diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 237c2ef217..fde642c373 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -200,7 +200,7 @@ gtk2_ardour_sources = [ 'route_time_axis.cc', 'route_ui.cc', 'ruler_dialog.cc', - 'save_as_dialog.cc', + 'save_as_dialog.cc', 'search_path_option.cc', 'selection.cc', 'selection_memento.cc', @@ -692,21 +692,21 @@ def build(bld): mo) def i18n(bld): - I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] - autowaf.build_i18n(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, - 'Paul Davis') - + I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] + autowaf.build_i18n(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, + 'Paul Davis') + def i18n_pot(bld): - I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] - autowaf.build_i18n_pot(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, - 'Paul Davis') + I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] + autowaf.build_i18n_pot(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, + 'Paul Davis') def i18n_po(bld): - I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] - autowaf.build_i18n_po(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, - 'Paul Davis') - + I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] + autowaf.build_i18n_po(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, + 'Paul Davis') + def i18n_mo(bld): - I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] - autowaf.build_i18n_mo(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, - 'Paul Davis') + I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] + autowaf.build_i18n_mo(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, + 'Paul Davis') diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 1d40f660db..b2bbf432a2 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -417,11 +417,11 @@ def build(bld): obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit.s', ] avx_sources = [ 'sse_functions_avx_linux.cc' ] elif bld.env['build_target'] == 'mingw': - # usability of the 64 bit windows assembler depends on the compiler target, - # not the build host, which in turn can only be inferred from the name - # of the compiler. - if re.search ('/^x86_64/', str(bld.env['CC'])): - obj.source += [ 'sse_functions_xmm.cc' ] + # usability of the 64 bit windows assembler depends on the compiler target, + # not the build host, which in turn can only be inferred from the name + # of the compiler. + if re.search ('/^x86_64/', str(bld.env['CC'])): + obj.source += [ 'sse_functions_xmm.cc' ] obj.source += [ 'sse_functions_64bit_win.s', 'sse_avx_functions_64bit_win.s' ] avx_sources = [ 'sse_functions_avx.cc' ] @@ -28,7 +28,7 @@ class i18n_mo(BuildContext): fun = 'i18n_mo' def is_tracks_build(self, *k, **kw): - return self.env['PROGRAM_NAME'] == 'Tracks Live' + return self.env['PROGRAM_NAME'] == 'Tracks Live' Context.Context.is_tracks_build = is_tracks_build @@ -447,13 +447,13 @@ int main() { return 0; }''', compiler_flags.append("-DBUILD_VECLIB_OPTIMIZATIONS"); conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'Accelerate']) elif conf.env['build_target'] == 'i686' or conf.env['build_target'] == 'x86_64': - compiler_flags.append ("-DBUILD_SSE_OPTIMIZATIONS") + compiler_flags.append ("-DBUILD_SSE_OPTIMIZATIONS") elif conf.env['build_target'] == 'mingw': - # usability of the 64 bit windows assembler depends on the compiler target, - # not the build host, which in turn can only be inferred from the name - # of the compiler. - if re.search ('/^x86_64/', str(conf.env['CC'])): - compiler_flags.append ("-DBUILD_SSE_OPTIMIZATIONS") + # usability of the 64 bit windows assembler depends on the compiler target, + # not the build host, which in turn can only be inferred from the name + # of the compiler. + if re.search ('/^x86_64/', str(conf.env['CC'])): + compiler_flags.append ("-DBUILD_SSE_OPTIMIZATIONS") if not build_host_supports_sse: print("\nWarning: you are building Ardour with SSE support even though your system does not support these instructions. (This may not be an error, especially if you are a package maintainer)") @@ -599,7 +599,7 @@ int main() { return 0; }''', conf.env.append_value('LINKFLAGS', linker_flags) def is_tracks_build (conf): - return conf.env['PROGRAM_NAME'] == 'Tracks Live' + return conf.env['PROGRAM_NAME'] == 'Tracks Live' #---------------------------------------------------------------- @@ -1131,9 +1131,9 @@ def build(bld): lwrcase_dirname = 'ardour' + bld.env['MAJOR'] if bld.is_tracks_build(): - bld.env.append_value ('CXXFLAGS', '-DUSE_TRACKS_CODE_FEATURES') - bld.env.append_value ('CFLAGS', '-DUSE_TRACKS_CODE_FEATURES') - lwrcase_dirname = 'trx' + bld.env.append_value ('CXXFLAGS', '-DUSE_TRACKS_CODE_FEATURES') + bld.env.append_value ('CFLAGS', '-DUSE_TRACKS_CODE_FEATURES') + lwrcase_dirname = 'trx' # configuration files go here bld.env['CONFDIR'] = os.path.join(bld.env['SYSCONFDIR'], lwrcase_dirname) |