From: Carl Hetherington Date: Fri, 12 Aug 2016 11:53:46 +0000 (+0100) Subject: More build fixes. X-Git-Tag: v2.9.11~16 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=2bd3a2f185b4755c4a01ba5c34c1d3e1f78e5c97 More build fixes. --- diff --git a/cscript b/cscript index 9641d1635..69458900b 100644 --- a/cscript +++ b/cscript @@ -237,7 +237,7 @@ def dependencies(target): ffmpeg_options = {} return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options), - ('libdcp', '06a5d64'), + ('libdcp', 'eec238a'), ('libsub', '067c21c')) def configure_options(target): diff --git a/src/lib/compose.hpp b/src/lib/compose.hpp index b78a8b9eb..2d2294717 100644 --- 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]; +#ifdef DCPOMATIC_WINDOWS + __mingw_snprintf(buffer, 64, "%" PRId64, obj); +#else snprintf(buffer, 64, "%" PRId64, obj); +#endif s += buffer; } diff --git a/src/lib/log_entry.cc b/src/lib/log_entry.cc index 18eed4894..8a6654811 100644 --- a/src/lib/log_entry.cc +++ b/src/lib/log_entry.cc @@ -20,6 +20,7 @@ #include "log_entry.h" #include +#include #include "i18n.h"