diff options
| author | Robin Gareus <robin@gareus.org> | 2020-01-22 00:47:33 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2020-01-25 04:07:42 +0100 |
| commit | 5a841ef4624ef4b776e578af80d2397241754b00 (patch) | |
| tree | 792514a39b03e1f446faf6df7de555019f15d2d6 /libs/ardour/wscript | |
| parent | 06b2eb1c277c35e653b9117b194eadbb65dcbb66 (diff) | |
Tweaks to build/package scripts for new waf
* Windows: delete waf installed .dll.a files
* Windows: override waf's conf.env.LIBDIR = conf.env.BINDIR
with explicit --libdir
* Windows: fix asm (`x86_64-w64-mingw32-as` -D flag is for
debug messages, -D defines are not available)
* Mac: override waf adding -install_name (and
-Wl,-compatibility_version -Wl,-current_version)
by moving -dynamiclib from linkflags to ldflags
* Mac: Allow libs with compat version number suffix
(not needed anymore, but may help in the future)
Diffstat (limited to 'libs/ardour/wscript')
| -rw-r--r-- | libs/ardour/wscript | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 3da991be71..7376bec868 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -1,6 +1,6 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -from waflib import Options +from waflib import Options, Task, Tools import os import sys import re @@ -373,6 +373,11 @@ def build(bld): # micro increment <=> no interface changes LIBARDOUR_LIB_VERSION = "3.0.0" + # remove '${DEFINES_ST:DEFINES}' from run_str. + # x86_64-w64-mingw32-as (mingw) -D flag is for debug messages + if bld.env['build_target'] == 'mingw': + class asm(Task.classes['asm']): run_str = '${AS} ${ASFLAGS} ${ASMPATH_ST:INCPATHS} ${AS_SRC_F}${SRC} ${AS_TGT_F}${TGT}' + # operate on copy to avoid adding sources twice sources = list(libardour_sources) |