From 65dd500200851297b40b98d62ef236367d6c9fb1 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 5 Sep 2014 07:47:57 -0400 Subject: [PATCH] Revert "[Summary] Fixed broken windows backend build. Made wavesaudio the only backend for Tracks" The wavesaudio backend only runs on OS X and Windows. This change makes it impossible to run Tracks on Linux. This reverts commit a6e33a0e25634441b292a905a4ad18430b9f0b6f. --- .../portmidi/src/porttime/ptwinmm.c | 6 ++--- libs/backends/wscript | 23 ++++++++++++++++++- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/libs/backends/wavesaudio/portmidi/src/porttime/ptwinmm.c b/libs/backends/wavesaudio/portmidi/src/porttime/ptwinmm.c index 3d5fbf0526..2021a13eee 100644 --- a/libs/backends/wavesaudio/portmidi/src/porttime/ptwinmm.c +++ b/libs/backends/wavesaudio/portmidi/src/porttime/ptwinmm.c @@ -2,14 +2,14 @@ #include "porttime.h" -//<<<<<<< HEAD +<<<<<<< HEAD #include "windows.h" #include "time.h" -//======= +======= #include #include #include -//>>>>>>> 41fe637... Add the 'porttime' source file for Windows +>>>>>>> 41fe637... Add the 'porttime' source file for Windows TIMECAPS caps; diff --git a/libs/backends/wscript b/libs/backends/wscript index bcd8079c1a..6e27643eed 100644 --- a/libs/backends/wscript +++ b/libs/backends/wscript @@ -10,7 +10,28 @@ top = '.' out = 'build' def backend_list(): - return [ 'wavesaudio' ] + if Options.options.program_name == 'Ardour': + # Ardour + backends = [ 'jack' ] + + if Options.options.build_dummy: + backends += [ 'dummy' ] + + if Options.options.build_alsabackend: + if re.search ("linux", sys.platform) != None: + backends += [ 'alsa' ] + + else: + # Not Ardour + if re.search ("linux", sys.platform) != None: + backends = [ 'jack', 'alsa' ] + else: + backends = [ ] + + if sys.platform == 'darwin' or sys.platform == 'mingw' or sys.platform == 'msvc': + backends += [ 'wavesaudio' ] + + return backends def options(opt): autowaf.set_options(opt)