X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=6a32165da0d4d15d1cceecd528316b4641df784d;hb=250daa31097e975e57aa8a4ff19df484812988ce;hp=69d68a35ce6ef73d36db89b0ea68561166a74e2f;hpb=4fd257106009b2db170dafddece06ee3c190fceb;p=dcpomatic.git

diff --git a/wscript b/wscript
index 69d68a35c..6a32165da 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dvdomatic'
-VERSION = '0.53pre'
+VERSION = '0.57pre'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -20,13 +20,15 @@ def configure(conf):
         conf.load('winres')
 
     conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', '-Wall', '-Wno-attributes'])
-    conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_VERSION="%s"' % VERSION])
 
     # Turn off player for now
     conf.options.disable_player = True
 
     if conf.options.target_windows:
-        conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN'])
+        conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H'])
+        if conf.options.enable_debug:
+            conf.env.append_value('CXXFLAGS', ['-mconsole'])
+            conf.env.append_value('LINKFLAGS', ['-mconsole'])
         conf.options.disable_player = True
         conf.check(lib = 'ws2_32', uselib_store = 'WINSOCK2', msg = "Checking for library winsock2")
         boost_lib_suffix = '-mt'
@@ -35,6 +37,7 @@ def configure(conf):
         conf.env.append_value('CXXFLAGS', '-DDVDOMATIC_POSIX')
         boost_lib_suffix = ''
         boost_thread = 'boost_thread'
+        conf.env.append_value('LINKFLAGS', '-pthread')
 
     conf.env.TARGET_WINDOWS = conf.options.target_windows
     conf.env.DISABLE_GUI = conf.options.disable_gui
@@ -49,7 +52,6 @@ def configure(conf):
     else:
         conf.env.append_value('CXXFLAGS', '-O3')
 
-    conf.check_cfg(package = 'sigc++-2.0', args = '--cflags --libs', uselib_store = 'SIGC++', mandatory = True)
     conf.check_cfg(package = 'libavformat', args = '--cflags --libs', uselib_store = 'AVFORMAT', mandatory = True)
     conf.check_cfg(package = 'libavfilter', args = '--cflags --libs', uselib_store = 'AVFILTER', mandatory = True)
     conf.check_cfg(package = 'libavcodec', args = '--cflags --libs', uselib_store = 'AVCODEC', mandatory = True)
@@ -58,7 +60,7 @@ def configure(conf):
     conf.check_cfg(package = 'libswresample', args = '--cflags --libs', uselib_store = 'SWRESAMPLE', mandatory = False)
     conf.check_cfg(package = 'libpostproc', args = '--cflags --libs', uselib_store = 'POSTPROC', mandatory = True)
     conf.check_cfg(package = 'sndfile', args = '--cflags --libs', uselib_store = 'SNDFILE', mandatory = True)
-    conf.check_cfg(package = 'libdcp', atleast_version = '0.21', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True)
+    conf.check_cfg(package = 'libdcp', atleast_version = '0.24', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True)
     conf.check_cfg(package = 'glib-2.0', args = '--cflags --libs', uselib_store = 'GLIB', mandatory = True)
     conf.check_cfg(package = '', path = 'Magick++-config', args = '--cppflags --cxxflags --libs', uselib_store = 'MAGICK', mandatory = True)
     conf.check_cc(msg = 'Checking for library libtiff', function_name = 'TIFFOpen', header_name = 'tiffio.h', lib = 'tiff', uselib_store = 'TIFF')
@@ -94,6 +96,21 @@ def configure(conf):
                               lib = ['boost_filesystem%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
                               uselib_store = 'BOOST_FILESYSTEM')
 
+    conf.check_cxx(fragment = """
+    			      #include <boost/date_time.hpp>\n
+    			      int main() { boost::gregorian::day_clock::local_day(); }\n
+			      """, msg = 'Checking for boost datetime library',
+                              libpath = '/usr/local/lib',
+                              lib = ['boost_date_time%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
+                              uselib_store = 'BOOST_DATETIME')
+
+    conf.check_cxx(fragment = """
+    			      #include <boost/signals2.hpp>\n
+    			      int main() { boost::signals2::signal<void (int)> x; }\n
+			      """,
+                              msg = 'Checking for boost signals2 library',
+                              uselib_store = 'BOOST_SIGNALS2')
+
     conf.check_cc(fragment = """
                              #include <glib.h>
                              int main() { g_format_size (1); }