diff options
| author | falkTX <falktx@falktx.com> | 2020-10-17 22:24:25 +0100 |
|---|---|---|
| committer | falkTX <falktx@falktx.com> | 2020-10-17 22:24:25 +0100 |
| commit | 0f2e3b2e830e7b9ea03bb67a00c1eec4deab0855 (patch) | |
| tree | 2b9b54e3fc497e7deedcfb024f653d920240b115 | |
| parent | a938d7aef3190c052eed66351c2a2c0562e022aa (diff) | |
| download | jack2-0f2e3b2e830e7b9ea03bb67a00c1eec4deab0855.tar.gz | |
Force library compat/current version under macOS
Signed-off-by: falkTX <falktx@falktx.com>
| -rw-r--r-- | common/wscript | 15 | ||||
| -rw-r--r-- | waflib/Tools/ccroot.py | 5 |
2 files changed, 13 insertions, 7 deletions
diff --git a/common/wscript b/common/wscript index a9dde271..114eb0a2 100644 --- a/common/wscript +++ b/common/wscript @@ -196,7 +196,10 @@ def build(bld): '../windows/JackMMCSS.cpp', ] - if not bld.env['IS_WINDOWS']: + if bld.env['IS_MACOSX']: + clientlib.cnum = bld.env['JACK_API_VERSION'] + clientlib.vnum = bld.env['JACK_VERSION'] + elif not bld.env['IS_WINDOWS']: clientlib.vnum = bld.env['JACK_API_VERSION'] if bld.env['IS_LINUX']: @@ -304,7 +307,10 @@ def build(bld): '../windows/JackNetWinSocket.cpp', ] - if not bld.env['IS_WINDOWS']: + if bld.env['IS_MACOSX']: + serverlib.cnum = bld.env['JACK_API_VERSION'] + serverlib.vnum = bld.env['JACK_VERSION'] + elif not bld.env['IS_WINDOWS']: serverlib.vnum = bld.env['JACK_API_VERSION'] if bld.env['IS_LINUX']: @@ -366,7 +372,10 @@ def build(bld): if bld.env['IS_WINDOWS']: netlib.source += ['../windows/JackNetWinSocket.cpp','../windows/JackWinThread.cpp', '../windows/JackMMCSS.cpp', '../windows/JackWinTime.c'] - if not bld.env['IS_WINDOWS']: + if bld.env['IS_MACOSX']: + netlib.cnum = bld.env['JACK_API_VERSION'] + netlib.vnum = bld.env['JACK_VERSION'] + elif not bld.env['IS_WINDOWS']: netlib.vnum = bld.env['JACK_API_VERSION'] create_jack_process_obj(bld, 'netmanager', 'JackNetManager.cpp', serverlib) diff --git a/waflib/Tools/ccroot.py b/waflib/Tools/ccroot.py index cfef8bf5..3397456e 100644 --- a/waflib/Tools/ccroot.py +++ b/waflib/Tools/ccroot.py @@ -575,13 +575,10 @@ def apply_vnum(self): cnum = getattr(self, 'cnum', str(nums[0])) cnums = cnum.split('.') - if len(cnums)>len(nums) or nums[0:len(cnums)] != cnums: - raise Errors.WafError('invalid compatibility version %s' % cnum) libname = node.name if libname.endswith('.dylib'): - name3 = libname.replace('.dylib', '.%s.dylib' % self.vnum) - name2 = libname.replace('.dylib', '.%s.dylib' % cnum) + name3 = name2 = libname.replace('.dylib', '.%s.dylib' % cnum) else: name3 = libname + '.' + self.vnum name2 = libname + '.' + cnum |