diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-02 12:51:24 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-02 12:51:24 -0400 |
| commit | aaabaf5d3c8624f398809bb468e2b121a23abda0 (patch) | |
| tree | 96c53dcea66d0731e4090c9b252253eacf2436fb /libs/pbd/wscript | |
| parent | c98fcb62fb7daf5f52098dfe5ad4e68e71ddfe70 (diff) | |
| parent | 94f366190e044462bd907de2d96f0d34b275b080 (diff) | |
Merge branch 'master' into windows
Diffstat (limited to 'libs/pbd/wscript')
| -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 e26b96ca11..6907dd7693 100644 --- a/libs/pbd/wscript +++ b/libs/pbd/wscript @@ -132,12 +132,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' ] |