LADI
/
jack2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Force library compat/current version under macOS 

Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2020-10-17 22:24:25 +01:00
parent a938d7aef3
commit 0f2e3b2e83
No known key found for this signature in database
GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/wscript
View File

@ -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)

5
waflib/Tools/ccroot.py
View File

@ -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