Bump version
[dcpomatic.git] / wscript
diff --git a/wscript b/wscript
index d129e620be2339595939fb8acb50816400443da0..ab83a0fd32e5c6a14df36f334175af1e2acd879f 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.07pre'
+VERSION = '1.28pre'
 
 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'
 
@@ -128,7 +129,7 @@ def configure(conf):
                        mandatory=True,
                        msg='Checking for libquickmail',
                        libpath='/usr/local/lib',
-                       lib='quickmail',
+                       lib=['quickmail', 'curl'],
                        uselib_store='QUICKMAIL')
 
     # Dependencies which are always dynamically linked
@@ -137,15 +138,7 @@ def configure(conf):
     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_cxx(fragment="""
-                            #include <zip.h>
-                            int main(void) { zip_open ("foo", 0, 0); }
-                            """,
-                   mandatory=True,
-                   msg='Checking for libzip',
-                   lib='zip',
-                   uselib_store='ZIP')
+    conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True)
 
     conf.check_cxx(fragment="""
                             #include <boost/version.hpp>\n