Merge branch 'master' into windows

[ardour.git] / libs / pbd / wscript

diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index 91d9b2c50bcb91fa5ce05fbcce6d89db52e8b000..59f7a3368b89492bd9fd753944bf29264559cf44 100644 (file)
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -45,6 +45,7 @@ libpbd_sources = [
     'enums.cc',
     'epa.cc',
     'error.cc',
+    'ffs.cc',
     'file_manager.cc',
     'file_utils.cc',
     'fpu.cc',
@@ -57,6 +58,7 @@ libpbd_sources = [
     'openuri.cc',
     'pathexpand.cc',
     'pathscanner.cc',
+    'pbd.cc',
     'pool.cc',
     'property_list.cc',
     'pthread_utils.cc',
@@ -131,12 +133,13 @@ def build(bld):
     obj.uselib       = 'GLIBMM SIGCPP XML UUID SNDFILE GIOMM'
     if sys.platform == 'darwin':
         TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc']
-        obj.source += [ 'cocoa_open_uri.mm' ]
+        if 'cocoa_open_uri.mm' not in obj.source:
+            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.defines     = ['PACKAGE="' + I18N_PACKAGE + '"']
-
+    
     if bld.env['build_target'] == 'x86_64':
         obj.defines += [ 'USE_X86_64_ASM' ]