smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 00:34:59 +01:00
Code Issues Projects Releases Wiki Activity

remove tabs from python code

Browse source
This commit is contained in:
Robin Gareus 2015-07-05 14:50:02 +02:00
parent 3ada7398e9
commit 7a7c87d5f4
4 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cfgtool/wscript
View file

@ -14,7 +14,7 @@ def configure(conf):
def build(bld): def build(bld):
if bld.env['build_target'] == 'mingw': if bld.env['build_target'] == 'mingw':
return; return;
obj = bld (features = 'cxx c cxxprogram') obj = bld (features = 'cxx c cxxprogram')
obj.source = 'cfgtool.cc' obj.source = 'cfgtool.cc'

26
gtk2_ardour/wscript
View file

@ -200,7 +200,7 @@ gtk2_ardour_sources = [
'route_time_axis.cc', 'route_time_axis.cc',
'route_ui.cc', 'route_ui.cc',
'ruler_dialog.cc', 'ruler_dialog.cc',
'save_as_dialog.cc', 'save_as_dialog.cc',
'search_path_option.cc', 'search_path_option.cc',
'selection.cc', 'selection.cc',
'selection_memento.cc', 'selection_memento.cc',
@ -692,21 +692,21 @@ def build(bld):
mo) mo)
def i18n(bld): def i18n(bld):
I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
autowaf.build_i18n(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, autowaf.build_i18n(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
'Paul Davis') 'Paul Davis')
def i18n_pot(bld): def i18n_pot(bld):
I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
autowaf.build_i18n_pot(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, autowaf.build_i18n_pot(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
'Paul Davis') 'Paul Davis')
def i18n_po(bld): def i18n_po(bld):
I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
autowaf.build_i18n_po(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, autowaf.build_i18n_po(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
'Paul Davis') 'Paul Davis')
def i18n_mo(bld): def i18n_mo(bld):
I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
autowaf.build_i18n_mo(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, autowaf.build_i18n_mo(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
'Paul Davis') 'Paul Davis')

10
libs/ardour/wscript
View file

@ -417,11 +417,11 @@ def build(bld):
obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit.s', ] obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit.s', ]
avx_sources = [ 'sse_functions_avx_linux.cc' ] avx_sources = [ 'sse_functions_avx_linux.cc' ]
elif bld.env['build_target'] == 'mingw': elif bld.env['build_target'] == 'mingw':
# usability of the 64 bit windows assembler depends on the compiler target, # 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 # not the build host, which in turn can only be inferred from the name
# of the compiler. # of the compiler.
if re.search ('/^x86_64/', str(bld.env['CC'])): if re.search ('/^x86_64/', str(bld.env['CC'])):
obj.source += [ 'sse_functions_xmm.cc' ] obj.source += [ 'sse_functions_xmm.cc' ]
obj.source += [ 'sse_functions_64bit_win.s', 'sse_avx_functions_64bit_win.s' ] obj.source += [ 'sse_functions_64bit_win.s', 'sse_avx_functions_64bit_win.s' ]
avx_sources = [ 'sse_functions_avx.cc' ] avx_sources = [ 'sse_functions_avx.cc' ]

22
wscript
View file

@ -28,7 +28,7 @@ class i18n_mo(BuildContext):
fun = 'i18n_mo' fun = 'i18n_mo'
def is_tracks_build(self, *k, **kw): 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 Context.Context.is_tracks_build = is_tracks_build
@ -447,13 +447,13 @@ int main() { return 0; }''',
compiler_flags.append("-DBUILD_VECLIB_OPTIMIZATIONS"); compiler_flags.append("-DBUILD_VECLIB_OPTIMIZATIONS");
conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'Accelerate']) conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'Accelerate'])
elif conf.env['build_target'] == 'i686' or conf.env['build_target'] == 'x86_64': 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': elif conf.env['build_target'] == 'mingw':
# usability of the 64 bit windows assembler depends on the compiler target, # 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 # not the build host, which in turn can only be inferred from the name
# of the compiler. # of the compiler.
if re.search ('/^x86_64/', str(conf.env['CC'])): if re.search ('/^x86_64/', str(conf.env['CC'])):
compiler_flags.append ("-DBUILD_SSE_OPTIMIZATIONS") compiler_flags.append ("-DBUILD_SSE_OPTIMIZATIONS")
if not build_host_supports_sse: 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)") 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) conf.env.append_value('LINKFLAGS', linker_flags)
def is_tracks_build (conf): 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'] lwrcase_dirname = 'ardour' + bld.env['MAJOR']
if bld.is_tracks_build(): if bld.is_tracks_build():
bld.env.append_value ('CXXFLAGS', '-DUSE_TRACKS_CODE_FEATURES') bld.env.append_value ('CXXFLAGS', '-DUSE_TRACKS_CODE_FEATURES')
bld.env.append_value ('CFLAGS', '-DUSE_TRACKS_CODE_FEATURES') bld.env.append_value ('CFLAGS', '-DUSE_TRACKS_CODE_FEATURES')
lwrcase_dirname = 'trx' lwrcase_dirname = 'trx'
# configuration files go here # configuration files go here
bld.env['CONFDIR'] = os.path.join(bld.env['SYSCONFDIR'], lwrcase_dirname) bld.env['CONFDIR'] = os.path.join(bld.env['SYSCONFDIR'], lwrcase_dirname)