Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJo Shields <directhex@apebox.org>2018-12-06 14:59:09 +0300
committerAlexander Köplinger <alex.koeplinger@outlook.com>2018-12-06 14:59:09 +0300
commit21dcc74a7a25dd48195deaea4e3c864735f3c1c1 (patch)
tree1d4347b65b219875ae1c4cdfdaee0a96f1bc1088 /packaging
parent8525f4c67940268c90b54d986161530763548244 (diff)
[Win32] Enable BTLS in Windows builds (#11947)
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/Windows/defs/mono3
-rwxr-xr-xpackaging/Windows/defs/mono643
2 files changed, 6 insertions, 0 deletions
diff --git a/packaging/Windows/defs/mono b/packaging/Windows/defs/mono
index dbdb691f1b4..36f11ab14e9 100755
--- a/packaging/Windows/defs/mono
+++ b/packaging/Windows/defs/mono
@@ -70,6 +70,9 @@ install()
cp -a msvc/build/boehm/Win32/bin/Release/mono-2.0-boehm.dll ${INSTALLDIR}/bin/
cp -a msvc/build/boehm/Win32/lib/Release/mono-2.0-boehm.lib ${INSTALLDIR}/lib/
cp -a msvc/build/boehm/Win32/bin/Release/mono-2.0-boehm.pdb ${INSTALLDIR}/lib/
+ if [ -e msvc/build/sgen/Win32/bin/Release/libmono-btls-shared.dll ]; then
+ cp -a msvc/build/sgen/Win32/bin/Release/libmono-btls-shared.dll ${INSTALLDIR}/bin/
+ fi
cp -a msvc/build/boehm/Win32/lib/Release/libmono-static-boehm.lib ${INSTALLDIR}/lib/
cp -a ${INSTALLDIR}/bin/mono-sgen.exe ${INSTALLDIR}/bin/mono.exe
cp -a ${INSTALLDIR}/bin/mono-sgen.pdb ${INSTALLDIR}/bin/mono.pdb
diff --git a/packaging/Windows/defs/mono64 b/packaging/Windows/defs/mono64
index 60a92e08b55..53f8d39cf00 100755
--- a/packaging/Windows/defs/mono64
+++ b/packaging/Windows/defs/mono64
@@ -65,6 +65,9 @@ install()
cp -a msvc/build/sgen/x64/bin/Release/MonoPosixHelper.dll ${INSTALLDIR}/bin/
cp -a msvc/build/sgen/x64/lib/Release/MonoPosixHelper.lib ${INSTALLDIR}/lib/
cp -a msvc/build/sgen/x64/bin/Release/MonoPosixHelper.pdb ${INSTALLDIR}/lib/
+ if [ -e msvc/build/sgen/x64/bin/Release/libmono-btls-shared.dll ]; then
+ cp -a msvc/build/sgen/x64/bin/Release/libmono-btls-shared.dll ${INSTALLDIR}/bin/
+ fi
cp -a ${INSTALLDIR}/bin/mono-sgen.exe ${INSTALLDIR}/bin/mono.exe
cp -a ${INSTALLDIR}/bin/mono-sgen.pdb ${INSTALLDIR}/bin/mono.pdb
popd