Locations::clear_ranges() leaves punch/loop/session ranges intact if they exist

[ardour.git] / libs / pbd / wscript

diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index 77a7d555d4a51f4cc6e092c90ad38cc75683d46e..ffaba889266ce7d2e7f7b33bc04a1f1b58c589e6 100644 (file)
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -37,7 +37,6 @@ libpbd_sources = [
     'convert.cc',
     'controllable.cc',
     'controllable_descriptor.cc',
-    'clear_dir.cc',
     'cpus.cc',
     'debug.cc',
     'enumwriter.cc',
@@ -54,10 +53,10 @@ libpbd_sources = [
     'locale_guard.cc',
     'localtime_r.cc',
     'malign.cc',
+    'md5.cc',
     'mountpoint.cc',
     'openuri.cc',
     'pathexpand.cc',
-    'pathscanner.cc',
     'pbd.cc',
     'pool.cc',
     'property_list.cc',
@@ -106,9 +105,14 @@ def configure(conf):
     # Boost headers
     autowaf.check_header(conf, 'cxx', 'boost/shared_ptr.hpp')
     autowaf.check_header(conf, 'cxx', 'boost/weak_ptr.hpp')
+    if Options.options.dist_target == 'mingw':
+        conf.check(compiler='cxx',
+                   lib='ole32',
+                   mandatory=True,
+                   uselib_store='OLE')
 
 def build(bld):
-    
+
     # Make signals_generated.h using signals.py
     bld(rule = 'python ${SRC} ${TGT}', source = 'pbd/signals.py', target = 'pbd/signals_generated.h')
 
@@ -141,16 +145,15 @@ def build(bld):
             obj.source += [ 'cocoa_open_uri.mm' ]
         obj.uselib += ' OSX'
     obj.vnum         = LIBPBD_LIB_VERSION
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    obj.install_path = bld.env['LIBDIR']
     obj.defines     += [ 'PACKAGE="' + I18N_PACKAGE + '"',
-                         'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"' 
                          ]
-    
+
     if bld.env['build_target'] == 'x86_64':
         obj.defines += [ 'USE_X86_64_ASM' ]
     if bld.env['build_target'] == 'mingw':
         obj.source += [ 'windows_special_dirs.cc' ]
-        obj.linkflags = ['-lole']
+        obj.uselib += ' OLE'
 
     if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
         # Unit tests