diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-01-25 21:28:56 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-01-25 21:28:56 +0000 |
| commit | ea2e02e0b433f11c76e6a993c32bd963da87b547 (patch) | |
| tree | fa11f194389be206883b2c8be6078e0edfee7b91 | |
| parent | 02e44f68612631a2e73709b90c5e259c0f333109 (diff) | |
More arch build fixes (#1449).
| -rw-r--r-- | src/lib/dcpomatic_socket.h | 1 | ||||
| -rw-r--r-- | src/lib/server.h | 1 | ||||
| -rw-r--r-- | src/wx/wscript | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/dcpomatic_socket.h b/src/lib/dcpomatic_socket.h index fa5250a1a..dd8ee49ed 100644 --- a/src/lib/dcpomatic_socket.h +++ b/src/lib/dcpomatic_socket.h @@ -19,6 +19,7 @@ */ #include <boost/asio.hpp> +#include <boost/noncopyable.hpp> /** @class Socket * @brief A class to wrap a boost::asio::ip::tcp::socket with some things diff --git a/src/lib/server.h b/src/lib/server.h index 747c516a2..465a444d7 100644 --- a/src/lib/server.h +++ b/src/lib/server.h @@ -24,6 +24,7 @@ #include <boost/thread.hpp> #include <boost/asio.hpp> #include <boost/thread/condition.hpp> +#include <boost/noncopyable.hpp> #include <string> class Socket; diff --git a/src/wx/wscript b/src/wx/wscript index 74d4d8bce..3be3a6763 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -171,8 +171,8 @@ def configure(conf): 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 + wx_version = subprocess.check_output([wx_config, '--version']).decode('UTF-8') + conf.in_msg = 0 if not wx_version.startswith('3.0.'): conf.fatal('wxwidgets version 3.0.x is required; %s found' % wx_version) |