X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=5780933297a229d1ce4f30d4a5dc0849fd174b3e;hb=bf6a4e484b5339d555f804eebe5c9e3697b13e6a;hp=cef56ddb78075239a46f4f1413627d8f3c76d228;hpb=c8099bee17289e3bd4282a76bfe31bdf400e8355;p=dcpomatic.git

diff --git a/wscript b/wscript
index cef56ddb7..578093329 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.17'
+VERSION = '1.40pre'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -51,11 +51,12 @@ def configure(conf):
         if conf.options.enable_debug:
             conf.env.append_value('CXXFLAGS', ['-mconsole'])
             conf.env.append_value('LINKFLAGS', ['-mconsole'])
-        conf.check(lib = 'ws2_32', uselib_store = 'WINSOCK2', msg = "Checking for library winsock2")
-        conf.check(lib = 'bfd', uselib_store = 'BFD', msg = "Checking for library bfd")
-        conf.check(lib = 'dbghelp', uselib_store = 'DBGHELP', msg = "Checking for library dbghelp")
-        conf.check(lib = 'iberty', uselib_store = 'IBERTY', msg = "Checking for library iberty")
-        conf.check(lib = 'shlwapi', uselib_store = 'SHLWAPI', msg = "Checking for library shlwapi")
+        conf.check(lib='ws2_32', uselib_store='WINSOCK2', msg="Checking for library winsock2")
+        conf.check(lib='bfd', uselib_store='BFD', msg="Checking for library bfd")
+        conf.check(lib='dbghelp', uselib_store='DBGHELP', msg="Checking for library dbghelp")
+        conf.check(lib='iberty', uselib_store='IBERTY', msg="Checking for library iberty")
+        conf.check(lib='shlwapi', uselib_store='SHLWAPI', msg="Checking for library shlwapi")
+        conf.check(lib='mswsock', uselib_store='MSWSOCK', msg="Checking for library mswsock")
         boost_lib_suffix = '-mt'
         boost_thread = 'boost_thread_win32-mt'
 
@@ -73,11 +74,12 @@ def configure(conf):
         conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_LINUX')
         # libxml2 seems to be linked against this on Ubuntu but it doesn't mention it in its .pc file
         conf.check_cfg(package='liblzma', args='--cflags --libs', uselib_store='LZMA', mandatory=True)
-        if conf.env.STATIC:
-            conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True)
-        else:
-            # On Linux we need to be able to include <gtk/gtk.h> to check GTK's version
-            conf.check_cfg(package='gtk+-2.0', args='--cflags', uselib_store='GTK', mandatory=True)
+        if not conf.env.DISABLE_GUI:
+            if conf.env.STATIC:
+                conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True)
+            else:
+                # On Linux we need to be able to include <gtk/gtk.h> to check GTK's version
+                conf.check_cfg(package='gtk+-2.0', args='--cflags', uselib_store='GTK', mandatory=True)
 
     # OSX-specific
     if conf.env.TARGET_OSX:
@@ -86,10 +88,10 @@ def configure(conf):
 
     # Dependencies which are dynamically linked everywhere except --static
     # Get libs only when we are dynamically linking
-    conf.check_cfg(package='libdcp',        atleast_version='0.81', args=pkg_config_args(conf), uselib_store='DCP',  mandatory=True)
+    conf.check_cfg(package='libdcp',        atleast_version='0.85', args=pkg_config_args(conf), uselib_store='DCP',  mandatory=True)
     # Remove erroneous escaping of quotes from xmlsec1 defines
     conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
-    conf.check_cfg(package='libcxml',       atleast_version='0.01', args=pkg_config_args(conf), uselib_store='CXML', mandatory=True)
+    conf.check_cfg(package='libcxml',       atleast_version='0.08', args=pkg_config_args(conf), uselib_store='CXML', mandatory=True)
     conf.check_cfg(package='libavformat',   args=pkg_config_args(conf), uselib_store='AVFORMAT',   mandatory=True)
     conf.check_cfg(package='libavfilter',   args=pkg_config_args(conf), uselib_store='AVFILTER',   mandatory=True)
     conf.check_cfg(package='libavcodec',    args=pkg_config_args(conf), uselib_store='AVCODEC',    mandatory=True)
@@ -183,6 +185,17 @@ def configure(conf):
                             lib=['boost_date_time%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
                             uselib_store='BOOST_DATETIME')
 
+    # Only Windows versions require boost::locale, which is handy, as it was only introduced in
+    # boost 1.48 and so isn't (easily) available on old Ubuntus.
+    if conf.env.TARGET_WINDOWS:
+        conf.check_cxx(fragment="""
+    			        #include <boost/locale.hpp>\n
+    			        int main() { std::locale::global (boost::locale::generator().generate ("")); }\n
+			        """, msg='Checking for boost locale library',
+                                libpath='/usr/local/lib',
+                                lib=['boost_locale%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
+                                uselib_store='BOOST_LOCALE')
+
     conf.check_cxx(fragment="""
     			    #include <boost/signals2.hpp>\n
     			    int main() { boost::signals2::signal<void (int)> x; }\n