diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-10-27 23:10:27 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-10-27 23:10:27 +0000 |
| commit | 9f7f0f79a3e8776164e7ae73eb4f40fce11e6539 (patch) | |
| tree | 5d0e09f58b100ba3517175977862b52ed53468b4 /gtk2_ardour | |
| parent | 04585abae320f28f3f9f790efabaf4d255b651a4 (diff) | |
Make build scripts python2/3 agnostic.
git-svn-id: svn://localhost/ardour2/branches/3.0@7931 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/wscript | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index c15f5609e2..e72d022829 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -286,7 +286,7 @@ def build(bld): obj.cxxflags += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"'] obj.cxxflags += ['-DLOCALEDIR="' + os.path.join( os.path.normpath(bld.env['DATADIR']), 'locale') + '"'] - obj.cxxflags += ['-DPROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"'] + obj.cxxflags += ['-DPROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"'] if bld.env['HAVE_SLV2']: obj.source += [ 'lv2_plugin_ui.cc' ] @@ -299,8 +299,8 @@ def build(bld): obj.source += [ 'vst_pluginui.cc' ] obj.cxxflags += [ '-DVST_SUPPORT' ] - if bld.env['PHONE_HOME']: - obj.cxxflags += [ '-DPHONE_HOME' ] + if bld.env['PHONE_HOME']: + obj.cxxflags += [ '-DPHONE_HOME' ] if bld.env['GTKOSX']: TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc'] @@ -344,13 +344,13 @@ def build(bld): obj = bld.new_task_gen('subst') obj.source = 'ardev_common.sh.in' obj.target = 'ardev_common_waf.sh' - obj.chmod = 0755 + obj.chmod = 0o755 obj.dict = wrapper_subst_dict obj = bld.new_task_gen('subst') obj.source = 'ardour.sh.in' obj.target = 'ardour3' - obj.chmod = 0755 + obj.chmod = 0o755 obj.dict = wrapper_subst_dict obj.install_path = bld.env['BINDIR'] @@ -392,7 +392,7 @@ def build(bld): # Set up font substitution dictionary for style in ['', 'BOLD', 'ITALIC']: - for sizename,points in font_sizes.iteritems(): + for sizename,points in iter(font_sizes.items()): if (len (style)): key = "_".join (['FONT',style,sizename]) fontstyle = " ".join ([basefont,style.lower(),points]) |