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 /src/tools/wscript | |
| parent | b2c412480aa2cc29bfbb90556f974e9294608898 (diff) | |
Add -x32/-x64 suffix to boost libraries when building for Windows.
Diffstat (limited to 'src/tools/wscript')
| -rw-r--r-- | src/tools/wscript | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/wscript b/src/tools/wscript index 018689e03..4b90995c7 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -23,7 +23,7 @@ from waflib import Logs import i18n def configure(conf): - if conf.env.TARGET_WINDOWS: + if conf.env.TARGET_WINDOWS_64 or conf.env.TARGET_WINDOWS_32: conf.env.append_value('CXXFLAGS', ['-mconsole']) conf.env.append_value('LINKFLAGS', ['-mconsole']) @@ -37,7 +37,7 @@ def build(bld): uselib += 'POLKIT ' uselib += 'LWEXT4 NANOMSG ' - if bld.env.TARGET_WINDOWS: + if bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32: uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE WINSOCK2 OLE32 DSOUND WINMM KSUSER SETUPAPI ' if bld.env.TARGET_LINUX: uselib += 'DL ' @@ -52,7 +52,7 @@ def build(bld): obj.includes = ['..'] obj.use = ['libdcpomatic2'] obj.source = '%s.cc' % t - if bld.env.TARGET_WINDOWS and t == 'dcpomatic_disk_writer': + if (bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32) and t == 'dcpomatic_disk_writer': obj.source += ' ../../platform/windows/%s.rc' % t # Prevent a console window opening when we start dcpomatic2_disk_writer obj.env.append_value('LINKFLAGS', '-Wl,-subsystem,windows') @@ -79,7 +79,7 @@ def build(bld): obj.includes = ['..'] obj.use = ['libdcpomatic2', 'libdcpomatic2-wx'] obj.source = '%s.cc' % t - if bld.env.TARGET_WINDOWS: + if bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32: obj.source += ' ../../platform/windows/%s.rc' % t obj.target = t.replace('dcpomatic', 'dcpomatic2') |