ardour/livetrax
13
0
Fork 0
Code

some more mingw x-compile fixes

Browse Source
This commit is contained in:
Robin Gareus 2014-03-04 18:53:43 +01:00
parent 912f07b919
commit 1c839ed541
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/fst/wscript
View File

@ -27,7 +27,7 @@ def configure(conf):
conf.load('misc') conf.load('misc')
conf.load('compiler_cxx') conf.load('compiler_cxx')
autowaf.configure(conf) autowaf.configure(conf)
if conf.env['WINDOWS_VST_SUPPORT'] == True and bld.env['build_target'] == 'mingw': if conf.env['WINDOWS_VST_SUPPORT'] == True and Options.options.dist_target == 'mingw':
conf.check(compiler='cxx', conf.check(compiler='cxx',
lib='gdi32', lib='gdi32',
mandatory=True, mandatory=True,

4
wscript
View File

@ -654,7 +654,9 @@ def configure(conf):
if Options.options.boost_sp_debug: if Options.options.boost_sp_debug:
conf.env.append_value('CXXFLAGS', '-DBOOST_SP_ENABLE_DEBUG_HOOKS') conf.env.append_value('CXXFLAGS', '-DBOOST_SP_ENABLE_DEBUG_HOOKS')
conf.check_cxx(fragment = "#include <boost/version.hpp>\nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n", # executing a test program is n/a when cross-compiling
if Options.options.dist_target != 'mingw':
conf.check_cxx(fragment = "#include <boost/version.hpp>\nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n",
execute = "1", execute = "1",
mandatory = True, mandatory = True,
msg = 'Checking for boost library >= 1.39', msg = 'Checking for boost library >= 1.39',