More build fixes.
authorCarl Hetherington <cth@carlh.net>
Fri, 12 Aug 2016 11:53:46 +0000 (12:53 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 12 Aug 2016 11:53:46 +0000 (12:53 +0100)
cscript
src/lib/compose.hpp
src/lib/log_entry.cc

diff --git a/cscript b/cscript
index 9641d16..6945890 100644 (file)
--- a/cscript
+++ b/cscript
@@ -237,7 +237,7 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options),
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options),
-            ('libdcp', '06a5d64'),
+            ('libdcp', 'eec238a'),
             ('libsub', '067c21c'))
 
 def configure_options(target):
             ('libsub', '067c21c'))
 
 def configure_options(target):
index b78a8b9..2d22947 100644 (file)
@@ -124,7 +124,11 @@ namespace StringPrivate
   inline void write(std::string& s, const int64_t& obj)
   {
     char buffer[64];
   inline void write(std::string& s, const int64_t& obj)
   {
     char buffer[64];
+#ifdef DCPOMATIC_WINDOWS
+    __mingw_snprintf(buffer, 64, "%" PRId64, obj);
+#else
     snprintf(buffer, 64, "%" PRId64, obj);
     snprintf(buffer, 64, "%" PRId64, obj);
+#endif
     s += buffer;
   }
 
     s += buffer;
   }
 
index 18eed48..8a66548 100644 (file)
@@ -20,6 +20,7 @@
 
 #include "log_entry.h"
 #include <inttypes.h>
 
 #include "log_entry.h"
 #include <inttypes.h>
+#include <cstdio>
 
 #include "i18n.h"
 
 
 #include "i18n.h"