diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-13 22:35:46 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-15 17:51:18 +0100 |
| commit | 06b5be0722782353ceff6e7fa94f115bd37ed8af (patch) | |
| tree | 53627f360ea8f86766ecec5e3a4d2761bd9414d0 /src | |
| parent | b43726102d7417b4ada23696c31bf6e2b29b551f (diff) | |
Centos build fixes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/wscript | 6 | ||||
| -rw-r--r-- | src/wx/wscript | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/wscript b/src/lib/wscript index 933368776..6d563f255 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -83,8 +83,8 @@ def build(bld): obj.uselib = """ AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 - SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++ - CURL ZIP QUICKMAIL + SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XMLPP + CURL ZIP QUICKMAIL XMLSEC """ if bld.env.TARGET_OSX: @@ -96,7 +96,7 @@ def build(bld): obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK BOOST_LOCALE' obj.source += ' stack.cpp' if bld.env.BUILD_STATIC: - obj.uselib += ' XML++' + obj.uselib += ' XMLPP' obj.target = 'dcpomatic' diff --git a/src/wx/wscript b/src/wx/wscript index f26a91cbc..8bf2451c2 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -67,6 +67,9 @@ def configure(conf): conf.env.LIB_WXWIDGETS.append('Xxf86vm') conf.env.LIB_WXWIDGETS.append('Xext') conf.env.LIB_WXWIDGETS.append('X11') + + if conf.env.TARGET_CENTOS_7: + conf.env.LIB_WXWIDGETS.append('Xxf86vm') conf.in_msg = 1 wx_version = conf.check_cfg(package='', path=conf.options.wx_config, args='--version').strip() |