Windows: Re-add --enable-btls-lib to build BTLS dll

I reverted this by mistake while investigating an unrelated crash.
See #66 for details.

This reverts commits aaee521d08
and 20368d7289.
This commit is contained in:
Rémi Verschelde
2022-05-24 15:45:48 +02:00
parent 7533d081e4
commit 2fa04b9dc7
3 changed files with 45 additions and 2 deletions

View File

@@ -88,12 +88,13 @@ def setup_desktop_template(env: dict, opts: DesktopOpts, product: str, target_pl
'--enable-maintainer-mode',
'--with-tls=pthread',
'--without-ikvm-native',
'--enable-btls'
'--enable-btls',
]
if target_platform == 'windows':
CONFIGURE_FLAGS += [
'--with-libgdiplus=%s' % opts.mxe_prefix
'--with-libgdiplus=%s' % opts.mxe_prefix,
'--enable-btls-lib',
]
else:
CONFIGURE_FLAGS += [
@@ -210,6 +211,14 @@ def configure(opts: DesktopOpts, product: str, target_platform: str, target: str
def make(opts: DesktopOpts, product: str, target_platform: str, target: str):
build_dir = path_join(opts.configure_dir, '%s-%s-%s' % (product, target, opts.configuration))
if target_platform == 'windows':
mxe = 'mxe-Win64' if target == 'x86_64' else 'mxe-Win32'
replace_in_new_file(
src_file='%s/sdks/builds/%s.cmake.in' % (opts.mono_source_root, mxe),
search='@MXE_PATH@', replace=opts.mxe_prefix,
dst_file='%s/mono/btls/%s.cmake' % (opts.mono_source_root, mxe)
)
make_args = make_default_args(opts)
make_args += ['-C', build_dir]