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 /libs | |
| 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 'libs')
| -rw-r--r-- | libs/ardour/wscript | 6 | ||||
| -rw-r--r-- | libs/gtkmm2ext/wscript | 2 | ||||
| -rw-r--r-- | libs/surfaces/wscript | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/wscript b/libs/ardour/wscript index a2c4898053..14811eed50 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -208,14 +208,14 @@ def flac_supported(): cmd = subprocess.Popen ("sndfile-info testfile.flac", stdout = subprocess.PIPE, stderr = subprocess.STDOUT, shell = True) - out = cmd.communicate()[0]; + out = cmd.communicate()[0].decode('utf-8'); return re.search ('unknown format', out) == None def ogg_supported(): cmd = subprocess.Popen ("sndfile-info testfile.ogg", stdout = subprocess.PIPE, stderr = subprocess.STDOUT, shell = True) - out = cmd.communicate()[0]; + out = cmd.communicate()[0].decode('utf-8'); return re.search ('unknown format', out) == None def set_options(opt): @@ -293,7 +293,7 @@ def build(bld): os.path.normpath(bld.env['DATADIR']), 'locale') + '"'] obj.cxxflags += ['-DVAMP_DIR="' + os.path.join( os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"'] - obj.cxxflags += ['-DPROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"'] + obj.cxxflags += ['-DPROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"'] #obj.source += ' st_stretch.cc st_pitch.cc ' #obj.uselib += ' SOUNDTOUCH ' diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript index 10d0248906..0425b66149 100644 --- a/libs/gtkmm2ext/wscript +++ b/libs/gtkmm2ext/wscript @@ -91,7 +91,7 @@ def build(bld): os.path.normpath(bld.env['DATADIRNAME']), 'locale') + '"'] if bld.env['GTKOSX']: obj.source += ['gtkapplication_quartz.mm'] - else: + else: obj.source += ['gtkapplication_x11.c'] def shutdown(): diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript index 2ff22bbfb6..f9e68f48f9 100644 --- a/libs/surfaces/wscript +++ b/libs/surfaces/wscript @@ -51,11 +51,11 @@ def configure(conf): if Options.options.wiimote: conf.check_cc (header_name='cwiid.h',define_name='HAVE_CWIID_H') if not conf.env['HAVE_CWIID_H']: - print 'WIIMOTE configured but you are missing libcwiid!' + print('WIIMOTE configured but you are missing libcwiid!') sys.exit(1) conf.check_cc (header_name='bluetooth/bluetooth.h',define_name='HAVE_BLUETOOTH_H') if not conf.env['HAVE_BLUETOOTH_H']: - print 'WIIMOTE configured but you are missing the libbluetooth headers needed to compile wiimote support!' + print('WIIMOTE configured but you are missing the libbluetooth headers needed to compile wiimote support!') sys.exit(1) conf.define ('BUILD_WIIMOTE', 1) |