From 3edc46320d31d0295690e0442fbe7e3386f38885 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 28 Oct 2015 10:52:35 -0400 Subject: [PATCH] build instructions updated --- MSVC.md | 8 ++------ QTCREATOR.md | 2 +- XCODE.md | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/MSVC.md b/MSVC.md index cb1d495c1..9dcf721f5 100644 --- a/MSVC.md +++ b/MSVC.md @@ -33,13 +33,9 @@ Open **VS2015 x86 Native Tools Command Prompt.bat** (should be in **Start Menu > git apply ./../../tdesktop/Telegram/_openssl_patch.diff perl Configure debug-VC-WIN32 --prefix=D:\TBuild\Libraries\openssl_debug\Debug ms\do_ms - git apply ./../../tdesktop/Telegram/_openssl_debug_patch.diff nmake -f ms\nt.mak nmake -f ms\nt.mak install -http://slproweb.com/products/Win32OpenSSL.html > Download [**Win32 OpenSSL v1.0.1p** (19.8 Mb)](http://slproweb.com/download/Win32OpenSSL-1_0_1p.exe) - -Install to **D:\TBuild\Libraries\OpenSSL-Win32**, while installing **Copy OpenSSL DLLs to** choose **The OpenSSL binaries (/bin) directory** ####LZMA SDK 9.20 @@ -164,7 +160,7 @@ and run git clone git://code.qt.io/qt/qt5.git QtStatic cd QtStatic - git checkout v5.5.1 + git checkout 5.5.1 perl init-repository --module-subset=qtbase,qtimageformats #####Apply the patch @@ -175,7 +171,7 @@ and run #####Building library - configure -debug-and-release -opensource -confirm-license -static -I "D:\TBuild\Libraries\OpenSSL-Win32\include" -L "C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Lib" -l Gdi32 -no-opengl -openssl-linked OPENSSL_LIBS_DEBUG="D:\TBuild\Libraries\OpenSSL-Win32\lib\VC\static\ssleay32MTd.lib D:\TBuild\Libraries\OpenSSL-Win32\lib\VC\static\libeay32MTd.lib" OPENSSL_LIBS_RELEASE="D:\TBuild\Libraries\OpenSSL-Win32\lib\VC\static\ssleay32MT.lib D:\TBuild\Libraries\OpenSSL-Win32\lib\VC\static\libeay32MT.lib" -mp -nomake examples -nomake tests -platform win32-msvc2015 + configure -debug-and-release -opensource -confirm-license -static -I "D:\TBuild\Libraries\openssl\Release\include" -L "C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Lib" -l Gdi32 -no-opengl -openssl-linked OPENSSL_LIBS_DEBUG="D:\TBuild\Libraries\openssl_debug\Debug\lib\ssleay32.lib D:\TBuild\Libraries\openssl_debug\Debug\lib\libeay32.lib" OPENSSL_LIBS_RELEASE="D:\TBuild\Libraries\openssl\Release\lib\ssleay32.lib D:\TBuild\Libraries\openssl\Release\lib\libeay32.lib" -mp -nomake examples -nomake tests -platform win32-msvc2015 nmake nmake install diff --git a/QTCREATOR.md b/QTCREATOR.md index dbdf70585..92e8b1292 100644 --- a/QTCREATOR.md +++ b/QTCREATOR.md @@ -93,7 +93,7 @@ In Terminal go to **/home/user/TBuild/Libraries** and run git clone git://code.qt.io/qt/qt5.git QtStatic cd QtStatic - git checkout v5.5.1 + git checkout 5.5.1 perl init-repository --module-subset=qtbase,qtimageformats #####Apply the patch diff --git a/XCODE.md b/XCODE.md index 0ed046a78..e36d06ffb 100644 --- a/XCODE.md +++ b/XCODE.md @@ -142,7 +142,7 @@ In Terminal go to **/Users/user/TBuild/Libraries** and run git clone git://code.qt.io/qt/qt5.git QtStatic cd QtStatic - git checkout v5.5.1 + git checkout 5.5.1 perl init-repository --module-subset=qtbase,qtimageformats #####Apply the patch