projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7fae6bc
)
tracks build ... backends are hard-coded
author
Paul Davis
<paul@linuxaudiosystems.com>
Fri, 8 May 2015 02:55:16 +0000
(22:55 -0400)
committer
Paul Davis
<paul@linuxaudiosystems.com>
Mon, 29 Jun 2015 18:18:10 +0000
(14:18 -0400)
wscript
patch
|
blob
|
history
diff --git
a/wscript
b/wscript
index cda1488188979148d9928e7d907f256bb7567a2f..84a8fb3e6c4a6db357cf7922718f1d2e7daa53bc 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-714,6
+714,7
@@
def configure(conf):
conf.env['VERSION'] = VERSION
conf.env['MAJOR'] = MAJOR
conf.env['MINOR'] = MINOR
conf.env['VERSION'] = VERSION
conf.env['MAJOR'] = MAJOR
conf.env['MINOR'] = MINOR
+ conf.env['MICRO'] = MICRO
conf.line_just = 52
autowaf.set_recursive()
autowaf.configure(conf)
conf.line_just = 52
autowaf.set_recursive()
autowaf.configure(conf)
@@
-981,10
+982,16
@@
def configure(conf):
autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=True)
backends = opts.with_backends.split(',')
autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=True)
backends = opts.with_backends.split(',')
+
if not backends:
print("Must configure and build at least one backend")
sys.exit(1)
if not backends:
print("Must configure and build at least one backend")
sys.exit(1)
+ if conf.is_tracks_build():
+ # For Tracks, override backends on OS X or Windows
+ if sys.platform == 'darwin' or sys.platform == 'mingw' or sys.platform == 'msvc':
+ backends = [ 'wavesaudio' ]
+
conf.env['BACKENDS'] = backends
conf.env['BUILD_JACKBACKEND'] = any('jack' in b for b in backends)
conf.env['BUILD_ALSABACKEND'] = any('alsa' in b for b in backends)
conf.env['BACKENDS'] = backends
conf.env['BUILD_JACKBACKEND'] = any('jack' in b for b in backends)
conf.env['BUILD_ALSABACKEND'] = any('alsa' in b for b in backends)
@@
-1008,7
+1015,6
@@
def configure(conf):
print("ALSA Backend is only available on Linux")
sys.exit(1)
print("ALSA Backend is only available on Linux")
sys.exit(1)
-
set_compiler_flags (conf, Options.options)
if sys.platform == 'darwin':
set_compiler_flags (conf, Options.options)
if sys.platform == 'darwin':