Missing include and hide a warning on Windows.
authorCarl Hetherington <cth@carlh.net>
Sat, 6 Dec 2014 20:24:26 +0000 (20:24 +0000)
committerCarl Hetherington <cth@carlh.net>
Sat, 6 Dec 2014 20:24:26 +0000 (20:24 +0000)
src/lib/writer.h
wscript

index 2fcae3deb53c1e71c357db45d45ae9bcb7605542..f8aeb8c8302ef89eb497c8076a3c878ec3897209 100644 (file)
@@ -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 b6ba6b66fdf691ac3a446d54e31b099fd370503f..f276e4d1601b6d9cfd14ae1cd2ac2b8adf5e628f 100644 (file)
--- 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: