From 62701cd6827b885fdfaef5159a542ea25a6c24b7 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 11 Jul 2013 10:39:51 +0100
Subject: More win32 build fixes.

---
 src/certificates.h | 3 ---
 src/crypt_chain.cc | 4 ++++
 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());
diff --git a/wscript b/wscript
index 5946d17d..0558609e 100644
--- a/wscript
+++ b/wscript
@@ -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')
 
-- 
cgit v1.2.3