diff options
| author | Robin Gareus <robin@gareus.org> | 2014-03-04 15:25:58 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-03-04 15:25:58 +0100 |
| commit | 912f07b919c1ec44f0cdd5278d74a9bc29b91846 (patch) | |
| tree | 1cd5f158ada5e8b9b73cf0d52ca5f9fa430c1fe9 /libs/pbd/wscript | |
| parent | 3e250d5f0649256c8e4c7c53da4f67383dd52f78 (diff) | |
mingw build fixes (tested with i686-w64-mingw32 on linux-x86_64)
Diffstat (limited to 'libs/pbd/wscript')
| -rw-r--r-- | libs/pbd/wscript | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/libs/pbd/wscript b/libs/pbd/wscript index 77a7d555d4..f424ae4c41 100644 --- a/libs/pbd/wscript +++ b/libs/pbd/wscript @@ -106,9 +106,14 @@ def configure(conf): # Boost headers autowaf.check_header(conf, 'cxx', 'boost/shared_ptr.hpp') autowaf.check_header(conf, 'cxx', 'boost/weak_ptr.hpp') + if conf.env['WINDOWS_VST_SUPPORT'] == True and Options.options.dist_target == 'mingw': + conf.check(compiler='cxx', + lib='ole32', + mandatory=True, + uselib_store='OLE') def build(bld): - + # Make signals_generated.h using signals.py bld(rule = 'python ${SRC} ${TGT}', source = 'pbd/signals.py', target = 'pbd/signals_generated.h') @@ -143,14 +148,14 @@ def build(bld): obj.vnum = LIBPBD_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"', - 'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"' + 'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"' ] - + if bld.env['build_target'] == 'x86_64': obj.defines += [ 'USE_X86_64_ASM' ] if bld.env['build_target'] == 'mingw': obj.source += [ 'windows_special_dirs.cc' ] - obj.linkflags = ['-lole'] + obj.uselib += ' OLE' if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'): # Unit tests |