From: Carl Hetherington <cth@carlh.net>
Date: Sun, 11 Jan 2015 22:59:59 +0000 (+0000)
Subject: Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
X-Git-Tag: v2.0.48~314
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=fae6eb8054d556adf03674d40cade4d8656ab1c1;hp=188ba79e36a626eb7481ceb2ef87d6fbf7da98a2

Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
---

diff --git a/src/tools/wscript b/src/tools/wscript
index ecbefe4c6..fb1f71654 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -11,7 +11,7 @@ def configure(conf):
 def build(bld):
     for t in ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm', 'dcpomatic_create']:
         obj = bld(features = 'cxx cxxprogram')
-        obj.uselib = 'BOOST_THREAD BOOST_DATETIME OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC WXWIDGETS SUB CURL'
+        obj.uselib = 'BOOST_THREAD BOOST_DATETIME BOOST_FILESYSTEM OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC WXWIDGETS SUB CURL'
         obj.includes = ['..']
         obj.use    = ['libdcpomatic2']
         obj.source = '%s.cc' % t
@@ -22,8 +22,8 @@ def build(bld):
     if not bld.env.DISABLE_GUI:
         for t in ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server']:
             obj = bld(features = 'cxx cxxprogram')
-            obj.uselib = 'BOOST_THREAD BOOST_DATETIME OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML WXWIDGETS SUB CURL'
-            if bld.env.BUILD_STATIC:
+            obj.uselib = 'BOOST_THREAD BOOST_DATETIME BOOST_FILESYSTEM OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML WXWIDGETS SUB CURL'
+            if bld.env.BUILD_STATIC or bld.env.TARGET_LINUX:
                 obj.uselib += ' GTK'
             obj.includes = ['..']
             obj.use    = ['libdcpomatic2', 'libdcpomatic2-wx']
diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 2caafbf8d..e0c3cd26f 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -157,6 +157,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	supported_by.Add (wxT ("Гуляев Михаил"));
 	supported_by.Add (wxT ("David Nedrow"));
 	supported_by.Add (wxT ("Tim O'Brien"));
+	supported_by.Add (wxT ("Jerome Cohen Olivar"));
 	supported_by.Add (wxT ("Ivan Pullman"));
 	supported_by.Add (wxT ("Mark Rolfe"));
 	supported_by.Add (wxT ("David Rozenthal"));
diff --git a/test/wscript b/test/wscript
index aaa96f898..d747ab521 100644
--- a/test/wscript
+++ b/test/wscript
@@ -12,7 +12,7 @@ def configure(conf):
 def build(bld):
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'unit-tests'
-    obj.uselib = 'BOOST_TEST BOOST_THREAD DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML MAGICK SUB'
+    obj.uselib = 'BOOST_TEST BOOST_THREAD BOOST_FILESYSTEM SNDFILE DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML MAGICK SUB'
     obj.use    = 'libdcpomatic2'
     obj.source = """
                  4k_test.cc
@@ -66,14 +66,3 @@ def build(bld):
 
     obj.target = 'unit-tests'
     obj.install_path = ''
-
-    obj = bld(features='cxx cxxprogram')
-    obj.name   = 'long-unit-tests'
-    obj.uselib = 'BOOST_TEST DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML SUB'
-    obj.use    = 'libdcpomatic2'
-    obj.source = """
-                 test.cc
-                 """
-
-    obj.target = 'long-unit-tests'
-    obj.install_path = ''
diff --git a/waf b/waf
index 178461f11..4d6635a84 100755
Binary files a/waf and b/waf differ