diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-07-02 18:34:48 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-07-02 18:34:48 +0100 |
| commit | 6bebefd325e60dd19342216f601e41e7cd459b55 (patch) | |
| tree | 4dfc97544caf70b38fe955133db118265a35527f /src | |
| parent | b77e848e61a94d6cacb047f4d383cb743a8a8f80 (diff) | |
Attempt to fix boost regex deps.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/wscript | 2 | ||||
| -rw-r--r-- | src/tools/wscript | 2 | ||||
| -rw-r--r-- | src/wx/wscript | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/wscript b/src/lib/wscript index 1f870462e..5a9c2b7fc 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -132,7 +132,7 @@ def build(bld): obj.export_includes = ['..'] obj.uselib = """ AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE - BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 + BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++ CURL ZIP PANGOMM CAIROMM XMLSEC SUB """ diff --git a/src/tools/wscript b/src/tools/wscript index ffd77c6cb..fb5619b99 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -28,7 +28,7 @@ def configure(conf): def build(bld): uselib = 'BOOST_THREAD BOOST_DATETIME OPENJPEG DCP XMLSEC CXML XMLPP AVFORMAT AVFILTER AVCODEC ' - uselib += 'AVUTIL SWSCALE POSTPROC CURL BOOST_FILESYSTEM SSH WXWIDGETS ZIP CAIROMM PANGOMM SUB MAGICK SNDFILE ' + uselib += 'AVUTIL SWSCALE POSTPROC CURL BOOST_FILESYSTEM BOOST_REGEX SSH WXWIDGETS ZIP CAIROMM PANGOMM SUB MAGICK SNDFILE ' if bld.env.TARGET_WINDOWS: uselib += 'WINSOCK2' diff --git a/src/wx/wscript b/src/wx/wscript index 370f59c62..b828c7711 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -105,11 +105,11 @@ def configure(conf): stlibs.append(os.path.basename(f)[3:-2]) else: new_linkflags.append(f) - + conf.env.STLIB_WXWIDGETS = stlibs conf.env.LINKFLAGS_WXWIDGETS = new_linkflags conf.env.STLIBPATH_WXWIDGETS = stlib_paths - + conf.in_msg = 1 wx_version = conf.check_cfg(package='', path='wx-config', args='--version').strip() conf.im_msg = 0 @@ -124,7 +124,7 @@ def build(bld): obj.name = 'libdcpomatic2-wx' obj.export_includes = ['..'] - obj.uselib = 'BOOST_FILESYSTEM BOOST_THREAD WXWIDGETS DCP SUB ZIP ' + obj.uselib = 'BOOST_FILESYSTEM BOOST_THREAD BOOST_REGEX WXWIDGETS DCP SUB ZIP ' if bld.env.TARGET_LINUX: obj.uselib += 'GTK ' if bld.env.TARGET_WINDOWS: |