diff --git a/Telegram/ThirdParty/libtgvoip b/Telegram/ThirdParty/libtgvoip index a19a0aff6..0e92a2274 160000 --- a/Telegram/ThirdParty/libtgvoip +++ b/Telegram/ThirdParty/libtgvoip @@ -1 +1 @@ -Subproject commit a19a0aff644127d8089f6a4ac18119ec5247dbd0 +Subproject commit 0e92a22746d15157bea46faddd61b79e9964275a diff --git a/Telegram/gyp/openssl.gypi b/Telegram/gyp/openssl.gypi index ce8ae3784..1e2433736 100644 --- a/Telegram/gyp/openssl.gypi +++ b/Telegram/gyp/openssl.gypi @@ -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', ], }, }, diff --git a/Telegram/gyp/utils.gyp b/Telegram/gyp/utils.gyp index 622462e19..bd463329c 100644 --- a/Telegram/gyp/utils.gyp +++ b/Telegram/gyp/utils.gyp @@ -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', ], diff --git a/docs/building-msvc.md b/docs/building-msvc.md index e09725845..65564f122 100644 --- a/docs/building-msvc.md +++ b/docs/building-msvc.md @@ -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