Skip to content

Commit

Permalink
build instructions updated
Browse files Browse the repository at this point in the history
  • Loading branch information
john-preston committed Oct 28, 2015
1 parent e8398e7 commit 3edc463
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
8 changes: 2 additions & 6 deletions MSVC.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion QTCREATOR.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion XCODE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3edc463

Please sign in to comment.