More build fixes.

diff --git a/cscript b/cscript
index 9641d1635b1d0c1de0a520bcf2cc4cf7a1ed4d36..69458900b88142d13a7b79671897324854e00840 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):

diff --git a/src/lib/compose.hpp b/src/lib/compose.hpp
index b78a8b9ebb172c95aa3f887c9134e9ee2afcf55e..2d22947178703a71deb702e3faedeb6fbd129ca2 100644 (file)
--- a/src/lib/compose.hpp
+++ b/src/lib/compose.hpp
@@ -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;
   }
 

diff --git a/src/lib/log_entry.cc b/src/lib/log_entry.cc
index 18eed489404b672aed23a835e35b9074e31ce9f2..8a665481154705638b421dce066b29753de40670 100644 (file)
--- a/src/lib/log_entry.cc
+++ b/src/lib/log_entry.cc
@@ -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"