diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-11 10:49:00 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-11 10:49:00 +0100 |
| commit | d5ec30b6d746177e97707085b9e6b709e41ecc20 (patch) | |
| tree | 5bb0509a861f1e42bf2a176016abee57bace991c | |
| parent | b3ad14bf234c2daa63b2a133b6af85ef5f59a455 (diff) | |
More win32 build hacks.
| -rw-r--r-- | src/certificates.h | 1 | ||||
| -rw-r--r-- | wscript | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/certificates.h b/src/certificates.h index 42ae8d27..9caea5a7 100644 --- a/src/certificates.h +++ b/src/certificates.h @@ -24,6 +24,7 @@ #include <list> #include <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> +#undef X509_NAME #include <openssl/x509.h> class certificates; @@ -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', '-DOPENSSL_SYS_WIN32']) + conf.env.append_value('CXXFLAGS', '-DLIBDCP_WINDOWS') else: conf.env.append_value('CXXFLAGS', '-DLIBDCP_POSIX') |