diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-02-22 23:01:23 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-02-25 14:55:24 +0100 |
| commit | 8f955150ff2b642109552dd234089f9a038bb3d6 (patch) | |
| tree | 29ba4328938928d6a36771be9f7cb72638a767a9 /test/wscript | |
| parent | b2c412480aa2cc29bfbb90556f974e9294608898 (diff) | |
Add -x32/-x64 suffix to boost libraries when building for Windows.
Diffstat (limited to 'test/wscript')
| -rw-r--r-- | test/wscript | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/test/wscript b/test/wscript index bb6484cd8..004611408 100644 --- a/test/wscript +++ b/test/wscript @@ -19,14 +19,16 @@ def configure(conf): boost_test_suffix='' - if conf.env.TARGET_WINDOWS: - boost_test_suffix='-mt' + if conf.env.TARGET_WINDOWS_64: + boost_test_suffix='-mt-x64' + elif conf.env.TARGET_WINDOWS_32: + boost_test_suffix='-mt-x32' conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=True) conf.check_cxx(fragment=""" #define BOOST_TEST_MODULE Config test\n - #include <boost/test/unit_test.hpp>\n + #include <boost/test/unit_test.hpp>\n int main() {} """, msg = 'Checking for boost unit testing library', lib = 'boost_unit_test_framework%s' % boost_test_suffix, uselib_store = 'BOOST_TEST') @@ -36,7 +38,7 @@ def build(bld): obj.uselib = 'BOOST_TEST BOOST_THREAD BOOST_FILESYSTEM BOOST_DATETIME SNDFILE SAMPLERATE DCP FONTCONFIG CAIROMM PANGOMM XMLPP ' obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE SWRESAMPLE POSTPROC CXML SUB GLIB CURL SSH XMLSEC BOOST_REGEX ICU NETTLE PNG ' obj.uselib += 'LEQM_NRT ZIP ' - if bld.env.TARGET_WINDOWS: + if bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32: obj.uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE ' if bld.env.TARGET_LINUX: obj.uselib += 'DL ' |