diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-12-15 00:40:50 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-12-22 01:21:00 +0100 |
| commit | 57584c74b859cdedde01ae51954933ac673e09fd (patch) | |
| tree | 594b0d27beb03e40446b680ea90f09c6c49f9c27 /wscript | |
| parent | 15f57fb7a60b8c88e11ec611c8fd3b1080aae8c8 (diff) | |
Windows build fix.
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -126,11 +126,6 @@ def configure(conf): conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=False) - if conf.options.target_windows: - # XXX: it feels like there should be a more elegant way to get these included - conf.env.LIB_XERCES.append('curl') - conf.env.LIB_XERCES.append('ws2_32') - if conf.options.static: if conf.options.jpeg == 'oj2': conf.check_cfg(package='libopenjp2', args='--cflags', atleast_version='2.1.0', uselib_store='OPENJPEG', mandatory=True) @@ -157,6 +152,11 @@ def configure(conf): conf.check_cfg(package='xerces-c', args='--cflags --libs', uselib_store='XERCES', mandatory=True) if conf.options.target_windows: + # XXX: it feels like there should be a more elegant way to get these included + conf.env.LIB_XERCES.append('curl') + conf.env.LIB_XERCES.append('ws2_32') + + if conf.options.target_windows: boost_lib_suffix = '-mt' else: boost_lib_suffix = '' |
