Resolve duplicate symbol 'cocoa_open_uri' on OSX builds.
authorMichael Fisher <mfisher31@gmail.com>
Fri, 2 Aug 2013 15:29:12 +0000 (10:29 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Fri, 2 Aug 2013 16:01:47 +0000 (12:01 -0400)
cocoa_open_uri.mm was being added to the source list
twice and also compiling twice. This patch enusres it is
only added once.

libs/pbd/wscript

index 5c8ed194a8d38e1296dc0822f0226b6380980ad9..0655e1ca4895da56102f21b02d307d1d2e835157 100644 (file)
@@ -128,12 +128,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' ]