RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use non-installed OpenSSL in Windows.

This commit is contained in:
John Preston 2019-06-24 13:43:42 +02:00
parent 7c2f114330
commit f46189041c
4 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/ThirdParty/libtgvoip vendored

@ -1 +1 @@
Subproject commit a19a0aff644127d8089f6a4ac18119ec5247dbd0
Subproject commit 0e92a22746d15157bea46faddd61b79e9964275a

8
Telegram/gyp/openssl.gypi
View File

@ -15,18 +15,18 @@
'configurations': {
'Debug': {
'include_dirs': [
'<(libs_loc)/openssl/Debug/include',
'<(libs_loc)/openssl/inc32',
],
'library_dirs': [
'<(libs_loc)/openssl/Debug/lib',
'<(libs_loc)/openssl/out32.dbg',
],
},
'Release': {
'include_dirs': [
'<(libs_loc)/openssl/Release/include',
'<(libs_loc)/openssl/inc32',
],
'library_dirs': [
'<(libs_loc)/openssl/Release/lib',
'<(libs_loc)/openssl/out32',
],
},
},

8
Telegram/gyp/utils.gyp
View File

@ -112,10 +112,10 @@
'conditions': [
[ 'build_win', {
'include_dirs': [
'<(libs_loc)/openssl/Debug/include',
'<(libs_loc)/openssl/inc32',
],
'library_dirs': [
'<(libs_loc)/openssl/Debug/lib',
'<(libs_loc)/openssl/out32.dbg',
'<(libs_loc)/lzma/C/Util/LzmaLib/Debug',
'<(libs_loc)/zlib/contrib/vstudio/vc14/x86/ZlibStatDebug',
],
@ -134,10 +134,10 @@
'conditions': [
[ 'build_win', {
'include_dirs': [
'<(libs_loc)/openssl/Release/include',
'<(libs_loc)/openssl/inc32',
],
'library_dirs': [
'<(libs_loc)/openssl/Release/lib',
'<(libs_loc)/openssl/out32',
'<(libs_loc)/lzma/C/Util/LzmaLib/Release',
'<(libs_loc)/zlib/contrib/vstudio/vc14/x86/ZlibStatReleaseWithoutAsm',
],

9
docs/building-msvc.md
View File

@ -66,17 +66,12 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
git clone https://github.com/openssl/openssl.git
cd openssl
git checkout OpenSSL_1_0_1-stable
perl Configure no-shared --prefix=%cd%\Release --openssldir=%cd%\Release VC-WIN32
perl Configure no-shared --prefix="C:\Program Files (x86)\OpenSSL" --openssldir="C:\Program Files (x86)\Common Files\SSL" VC-WIN32
ms\do_ms
nmake -f ms\nt.mak
nmake -f ms\nt.mak install
xcopy tmp32\lib.pdb Release\lib\
nmake -f ms\nt.mak clean
perl Configure no-shared --prefix=%cd%\Debug --openssldir=%cd%\Debug debug-VC-WIN32
perl Configure no-shared --prefix="C:\Program Files (x86)\OpenSSL" --openssldir="C:\Program Files (x86)\Common Files\SSL" debug-VC-WIN32
ms\do_ms
nmake -f ms\nt.mak
nmake -f ms\nt.mak install
xcopy tmp32.dbg\lib.pdb Debug\lib\
cd ..
git clone https://github.com/telegramdesktop/zlib.git