Browse Source

Force library compat/current version under macOS

Signed-off-by: falkTX <falktx@falktx.com>
tags/v1.9.17
falkTX 3 years ago
parent
commit
0f2e3b2e83
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 13 additions and 7 deletions
  1. +12
    -3
      common/wscript
  2. +1
    -4
      waflib/Tools/ccroot.py

+ 12
- 3
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)


+ 1
- 4
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


Loading…
Cancel
Save