ardour/livetrax
13
0
Fork 0
Code

Resolve duplicate symbol 'cocoa_open_uri' on OSX builds.

Browse Source 
cocoa_open_uri.mm was being added to the source list
twice and also compiling twice. This patch enusres it is
only added once.
This commit is contained in:
Michael Fisher 2013-08-02 10:29:12 -05:00 committed by Paul Davis
parent 23f738c699
commit 71c26e2820
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/pbd/wscript
View File

@ -128,12 +128,13 @@ def build(bld):
obj.uselib = 'GLIBMM SIGCPP XML UUID SNDFILE GIOMM' obj.uselib = 'GLIBMM SIGCPP XML UUID SNDFILE GIOMM'
if sys.platform == 'darwin': if sys.platform == 'darwin':
TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc'] 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.uselib += ' OSX'
obj.vnum = LIBPBD_LIB_VERSION obj.vnum = LIBPBD_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"'] obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"']
if bld.env['build_target'] == 'x86_64': if bld.env['build_target'] == 'x86_64':
obj.defines += [ 'USE_X86_64_ASM' ] obj.defines += [ 'USE_X86_64_ASM' ]