diff options
| author | Michael Fisher <mfisher31@gmail.com> | 2013-08-02 10:29:12 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-02 12:01:47 -0400 |
| commit | 71c26e28202dc6fe45a13cbb13904c0288045c38 (patch) | |
| tree | 2942f629aca3326ddfc0bcc32375fffef2e78d14 /libs/pbd | |
| parent | 23f738c69965fe8a2f1bca4d60ab702edd656455 (diff) | |
Resolve duplicate symbol 'cocoa_open_uri' on OSX builds.
cocoa_open_uri.mm was being added to the source list
twice and also compiling twice. This patch enusres it is
only added once.
Diffstat (limited to 'libs/pbd')
| -rw-r--r-- | libs/pbd/wscript | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/pbd/wscript b/libs/pbd/wscript index 5c8ed194a8..0655e1ca48 100644 --- a/libs/pbd/wscript +++ b/libs/pbd/wscript @@ -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' ] |