X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=aa5cd65dd01fb70a4d3fb7c3aa56532727f7305b;hb=62449f8a80feb88c17695dd71af4f881f2029dcf;hp=587b70c839a32aee38cdef3a37140bf86a416bf3;hpb=d34d4b360f9c49b6619dc0e6bca554a267f499d4;p=libdcp.git

diff --git a/wscript b/wscript
index 587b70c8..aa5cd65d 100644
--- a/wscript
+++ b/wscript
@@ -2,7 +2,7 @@ import subprocess
 import os
 
 APPNAME = 'libdcp'
-VERSION = '0.63'
+VERSION = '0.83pre'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -13,7 +13,7 @@ def options(opt):
 
 def configure(conf):
     conf.load('compiler_cxx')
-    conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-O2', '-D_FILE_OFFSET_BITS=64'])
+    conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-D_FILE_OFFSET_BITS=64'])
     conf.env.append_value('CXXFLAGS', ['-DLIBDCP_VERSION="%s"' % VERSION])
 
     conf.env.TARGET_WINDOWS = conf.options.target_windows
@@ -22,7 +22,7 @@ def configure(conf):
     conf.env.ENABLE_DEBUG = conf.options.enable_debug
 
     if conf.options.target_windows:
-        conf.env.append_value('CXXFLAGS', ['-DLIBDCP_WINDOWS', '-DOPENSSL_SYS_WIN32'])
+        conf.env.append_value('CXXFLAGS', '-DLIBDCP_WINDOWS')
     else:
         conf.env.append_value('CXXFLAGS', '-DLIBDCP_POSIX')
 
@@ -49,8 +49,8 @@ def configure(conf):
         conf.env.HAVE_CXML = 1
         conf.env.STLIB_CXML = ['cxml']
     else:
-        conf.check_cfg(package = 'libopenjpeg', args = '--cflags --libs', uselib_store = 'OPENJPEG', mandatory = True)
-        conf.check_cfg(package = 'libcxml', args = '--cflags --libs', uselib_store = 'CXML', mandatory = True)
+        conf.check_cfg(package='libopenjpeg', args='--cflags --libs', uselib_store='OPENJPEG', mandatory=True)
+        conf.check_cfg(package='libcxml', atleast_version='0.07', args='--cflags --libs', uselib_store='CXML', mandatory=True)
 
     if conf.options.target_windows:
         boost_lib_suffix = '-mt'