Fix crash on using delay; fix x-thread GUI access caused by FilmState default copy...

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index 4efb32a987ac7bd33e6bcf34b8e34fbf7f74e251..2a11234d0256999008806eee88bf7dab88de0725 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,13 +3,12 @@ import os
 import sys
 
 APPNAME = 'dvdomatic'
-VERSION = '0.50'
+VERSION = '0.56pre'
 
 def options(opt):
     opt.load('compiler_cxx')
     opt.load('winres')
 
-    opt.add_option('--debug-hash', action='store_true', default = False, help = 'print hashes of data at various points')
     opt.add_option('--enable-debug', action='store_true', default = False, help = 'build with debugging information and without optimisation')
     opt.add_option('--disable-gui', action='store_true', default = False, help = 'disable building of GUI tools')
     opt.add_option('--disable-player', action='store_true', default = False, help = 'disable building of the player components')
@@ -21,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'])
+        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'
@@ -37,7 +38,6 @@ def configure(conf):
         boost_lib_suffix = ''
         boost_thread = 'boost_thread'
 
-    conf.env.DEBUG_HASH = conf.options.debug_hash
     conf.env.TARGET_WINDOWS = conf.options.target_windows
     conf.env.DISABLE_GUI = conf.options.disable_gui
     conf.env.DISABLE_PLAYER = conf.options.disable_player
@@ -96,6 +96,14 @@ 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_cc(fragment = """
                              #include <glib.h>
                              int main() { g_format_size (1); }