From 1c039d9e6e61478f425b2188927eebcb858e33e0 Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 17 Jun 2020 00:38:15 +0100 Subject: [PATCH] remove switch to shared libs for linking windows binaries This allows us to use static pthread with regular mingw builds Signed-off-by: falkTX --- common/wscript | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/common/wscript b/common/wscript index 1087ac33..0aba00ab 100644 --- a/common/wscript +++ b/common/wscript @@ -202,6 +202,8 @@ def build(bld): clientlib.env.append_value('LINKFLAGS', '-lnsl -lsocket') if bld.env['IS_WINDOWS']: + # remove switch to shared binaries, as we most likely want static builds on Windows + clientlib.env['SHLIB_MARKER'] = '' # statically link libjack to libstdc++, some client apps like ardour come # with a different version of libstdc++.dll that takes precedence and results # in missing symbols during runtime @@ -221,9 +223,11 @@ def build(bld): serverlib.target = 'jackserver'+libsuffix serverlib.use = uselib if bld.env['IS_WINDOWS']: - serverlib.env['cxxshlib_PATTERN'] = 'lib%s.dll' - serverlib.env['cxxstlib_PATTERN'] = 'lib%s.a' - serverlib.env['implib_PATTERN'] = 'lib%s.dll.a' + serverlib.env['cxxshlib_PATTERN'] = 'lib%s.dll' + serverlib.env['cxxstlib_PATTERN'] = 'lib%s.a' + serverlib.env['implib_PATTERN'] = 'lib%s.dll.a' + serverlib.env['SHLIB_MARKER'] = '' + serverlib.env.append_value('LINKFLAGS', ['-static-libstdc++', '--disable-auto-import']) serverlib.install_path = '${LIBDIR}' serverlib.source = [] + common_libsources serverlib.source += [ @@ -323,6 +327,7 @@ def build(bld): netlib.env['cxxshlib_PATTERN'] = 'lib%s.dll' netlib.env['cxxstlib_PATTERN'] = 'lib%s.a' netlib.env['implib_PATTERN'] = 'lib%s.dll.a' + netlib.env['SHLIB_MARKER'] = '' netlib.use += ['WS2_32', 'WINMM'] elif not bld.env['IS_MACOSX']: netlib.use += ['RT']