summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-12-06 20:24:26 +0000
committerCarl Hetherington <cth@carlh.net>2014-12-06 20:24:26 +0000
commit83c9d11d41a348af3b69055813d6f04cb36ea398 (patch)
tree5e28ff341476dd24c864b4ef8c6ba3e4714ccfc6
parent0c47b6b09d0aa0ad5495d8e9c57bfc47e905fc30 (diff)
Missing include and hide a warning on Windows.
-rw-r--r--src/lib/writer.h1
-rw-r--r--wscript1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/writer.h b/src/lib/writer.h
index 2fcae3deb..f8aeb8c83 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -26,6 +26,7 @@
#include "player_subtitles.h"
#include <dcp/subtitle_content.h>
#include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
#include <boost/thread.hpp>
#include <boost/thread/condition.hpp>
#include <list>
diff --git a/wscript b/wscript
index b6ba6b66f..f276e4d16 100644
--- a/wscript
+++ b/wscript
@@ -206,6 +206,7 @@ def configure(conf):
conf.env.append_value('CXXFLAGS', '-DUNICODE')
conf.env.append_value('CXXFLAGS', '-DBOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN')
conf.env.append_value('CXXFLAGS', '-mfpmath=sse')
+ conf.env.append_value('CXXFLAGS', '-Wno-deprecated-declarations')
wxrc = os.popen('wx-config --rescomp').read().split()[1:]
conf.env.append_value('WINRCFLAGS', wxrc)
if conf.options.enable_debug: