diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-11 10:39:51 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-11 10:39:51 +0100 |
| commit | 62701cd6827b885fdfaef5159a542ea25a6c24b7 (patch) | |
| tree | e713a8b9c6b8bd2cbca47d7b4bb39ce2e9087db1 | |
| parent | 0f1518f21f26488a5c5511f04996155682ba5514 (diff) | |
More win32 build fixes.
| -rw-r--r-- | src/certificates.h | 3 | ||||
| -rw-r--r-- | src/crypt_chain.cc | 4 | ||||
| -rw-r--r-- | wscript | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/certificates.h b/src/certificates.h index 06baa547..42ae8d27 100644 --- a/src/certificates.h +++ b/src/certificates.h @@ -24,9 +24,6 @@ #include <list> #include <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> -#ifdef LIBDCP_WINDOWS -#include "wincrypt.h" -#endif #include <openssl/x509.h> class certificates; diff --git a/src/crypt_chain.cc b/src/crypt_chain.cc index ee1b2486..d495c970 100644 --- a/src/crypt_chain.cc +++ b/src/crypt_chain.cc @@ -33,7 +33,11 @@ using std::cout; static void command (char const * c) { int const r = system (c); +#ifdef LIBDCP_WINDOWS if (r) { +#else + if (WEXITSTATUS (r)) { +#endif stringstream s; s << "error in " << c << "\n"; throw libdcp::MiscError (s.str()); @@ -22,7 +22,7 @@ def configure(conf): conf.env.ENABLE_DEBUG = conf.options.enable_debug if conf.options.target_windows: - conf.env.append_value('CXXFLAGS', '-DLIBDCP_WINDOWS') + conf.env.append_value('CXXFLAGS', ['-DLIBDCP_WINDOWS', 'OPENSSL_SYS_WIN32']) else: conf.env.append_value('CXXFLAGS', '-DLIBDCP_POSIX') |