Try SetAppName to fix OS X ugly menu options (#229).

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index 1d699ca0741974fe8d400448b0ce9939266139d4..a6cd9fd9d49dbad669a86adc19aaac3159bc761d 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.00pre'
+VERSION = '1.17pre'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -45,7 +45,7 @@ def configure(conf):
 
     # Windows-specific
     if conf.env.TARGET_WINDOWS:
-        conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H', '-DUNICODE'])
+        conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H', '-DUNICODE', '-DBOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN'])
         wxrc = os.popen('wx-config --rescomp').read().split()[1:]
         conf.env.append_value('WINRCFLAGS', wxrc)
         if conf.options.enable_debug:
@@ -86,7 +86,7 @@ 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.67', args=pkg_config_args(conf), uselib_store='DCP',  mandatory=True)
+    conf.check_cfg(package='libdcp',        atleast_version='0.81', 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)
@@ -119,12 +119,25 @@ def configure(conf):
         conf.env.STLIB_POSTPROC   = ['postproc']
         conf.env.STLIB_SWRESAMPLE = ['swresample']
         conf.env.STLIB_OPENJPEG   = ['openjpeg']
+        conf.env.STLIB_QUICKMAIL  = ['quickmail']
+    else:
+        conf.check_cxx(fragment="""
+                            #include <quickmail.h>
+                            int main(void) { quickmail_initialize (); }
+                            """,
+                       mandatory=True,
+                       msg='Checking for libquickmail',
+                       libpath='/usr/local/lib',
+                       lib=['quickmail', 'curl'],
+                       uselib_store='QUICKMAIL')
 
     # Dependencies which are always dynamically linked
     conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=True)
     conf.check_cfg(package='glib-2.0', args='--cflags --libs', uselib_store='GLIB', mandatory=True)
     conf.check_cfg(package= '', path=conf.options.magickpp_config, args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True)
     conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XML++', mandatory=True)
+    conf.check_cfg(package='libcurl', args='--cflags --libs', uselib_store='CURL', mandatory=True)
+    conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True)
 
     conf.check_cxx(fragment="""
                             #include <boost/version.hpp>\n
@@ -242,17 +255,13 @@ def dist(ctx):
 
 def create_version_cc(version, cxx_flags):
     commit = git_revision()
-    print "1: ", commit
     if commit is None and os.path.exists('.git_revision'):
         f = open('.git_revision', 'r')
         commit = f.readline().strip()
-        print "2: ", commit
     
     if commit is None:
         commit = 'release'
 
-    print commit
-
     try:
         text =  '#include "version.h"\n'
         text += 'char const * dcpomatic_git_commit = \"%s\";\n' % commit