diff options
| author | Robin Gareus <robin@gareus.org> | 2014-10-03 00:46:34 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-10-03 00:46:34 +0200 |
| commit | 0af091edf396698e6ffff1053f1aa1129c227350 (patch) | |
| tree | f9a23f7bd5da5db68a9d05bdfa148fed3c79cafa /libs | |
| parent | c2fc7f04a7854d99e8a040ebdf52a6330bd4fe8f (diff) | |
fix ming32 build&install for asio backend
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/backends/wavesaudio/waves_audiobackend.cc | 2 | ||||
| -rw-r--r-- | libs/backends/wavesaudio/wscript | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/libs/backends/wavesaudio/waves_audiobackend.cc b/libs/backends/wavesaudio/waves_audiobackend.cc index 0da28944de..23ab624aa4 100644 --- a/libs/backends/wavesaudio/waves_audiobackend.cc +++ b/libs/backends/wavesaudio/waves_audiobackend.cc @@ -23,7 +23,7 @@ using namespace ARDOUR; -#ifdef __MINGW64__ +#if defined __MINGW64__ || defined __MINGW32__ extern "C" __declspec(dllexport) ARDOUR::AudioBackendInfo* descriptor () #else extern "C" ARDOURBACKEND_API ARDOUR::AudioBackendInfo* descriptor () diff --git a/libs/backends/wavesaudio/wscript b/libs/backends/wavesaudio/wscript index f083128e84..f37c7abbde 100644 --- a/libs/backends/wavesaudio/wscript +++ b/libs/backends/wavesaudio/wscript @@ -29,8 +29,8 @@ def build(bld): if bld.env['build_target'] == 'mingw': obj = bld(features = 'cxx cxxshlib') else: - obj = bld(features = 'c cxx cxxshlib') - + obj = bld(features = 'c cxx cxxshlib') + if sys.platform == 'darwin': if bld.env['build_target'] not in [ 'lion' ]: obj.framework = 'CoreMidi' @@ -94,8 +94,9 @@ def build(bld): obj.target = 'waves_audiobackend' obj.use = 'libardour libpbd' if bld.env['build_target'] == 'mingw': - obj.uselib = ['PORTAUDIO'] - obj.vnum = WAVESAUDIOBACKEND_VERSION + obj.uselib = ['PORTAUDIO'] + if (bld.env['build_target'] != 'mingw'): + obj.vnum = WAVESAUDIOBACKEND_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'backends') if bld.env['build_target']== 'mingw': |