From 98afc99a8feba09d9d6c3fd4a15d89a8c0a8644e Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 30 Oct 2020 13:17:02 +0300 Subject: [PATCH] Update submodules and instructions. --- Telegram/ThirdParty/range-v3 | 2 +- Telegram/ThirdParty/rlottie | 2 +- Telegram/lib_ui | 2 +- cmake | 2 +- docs/building-cmake.md | 59 ++++++++++++++++++----------------- docs/building-msvc.md | 49 ++++++++++++++++++++--------- docs/building-osx.md | 2 +- docs/building-xcode.md | 60 ++++++++++++++++++------------------ 8 files changed, 99 insertions(+), 79 deletions(-) diff --git a/Telegram/ThirdParty/range-v3 b/Telegram/ThirdParty/range-v3 index 2d606af5c7..413c8f9aac 160000 --- a/Telegram/ThirdParty/range-v3 +++ b/Telegram/ThirdParty/range-v3 @@ -1 +1 @@ -Subproject commit 2d606af5c71a47e91e095db20d8ba2d84a1ca113 +Subproject commit 413c8f9aacb269f6440fe180b587fd70c7ba16df diff --git a/Telegram/ThirdParty/rlottie b/Telegram/ThirdParty/rlottie index 839dcab7f0..3426bf778d 160000 --- a/Telegram/ThirdParty/rlottie +++ b/Telegram/ThirdParty/rlottie @@ -1 +1 @@ -Subproject commit 839dcab7f083a51b8130061ea5ec245195af6c58 +Subproject commit 3426bf778d306d41b1d1052fa06fa07ba24b2608 diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 914df12ebe..109375453e 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 914df12ebe3231dbdd5150d5b33cfab2e7dabe17 +Subproject commit 109375453e1465daff0970a920ba65e9fe8c78f0 diff --git a/cmake b/cmake index cfc6051fb6..a7e73ebc03 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit cfc6051fb65da4c67ccbc2a1d9e753758f995fe3 +Subproject commit a7e73ebc036fdf32cdca56b62405bf9dcd8f8f09 diff --git a/docs/building-cmake.md b/docs/building-cmake.md index 11e7220954..27022d9a92 100644 --- a/docs/building-cmake.md +++ b/docs/building-cmake.md @@ -262,23 +262,24 @@ Go to ***BuildPath*** and run OPENSSL_DIR=/usr/local/desktop-app/openssl-1.1.1 ./configure -prefix "/usr/local/desktop-app/Qt-5.12.8" \ - -release \ - -force-debug-info \ - -opensource \ - -confirm-license \ - -qt-zlib \ - -qt-libpng \ - -qt-harfbuzz \ - -qt-pcre \ - -qt-xcb \ - -no-gtk \ - -no-icu \ - -static \ - -dbus-runtime \ - -openssl-linked \ - -I "$OPENSSL_DIR/include" OPENSSL_LIBS="$OPENSSL_DIR/lib/libssl.a $OPENSSL_DIR/lib/libcrypto.a -ldl -lpthread" \ - -nomake examples \ - -nomake tests + -release \ + -force-debug-info \ + -opensource \ + -confirm-license \ + -qt-zlib \ + -qt-libpng \ + -qt-harfbuzz \ + -qt-pcre \ + -qt-xcb \ + -no-gtk \ + -no-icu \ + -static \ + -dbus-runtime \ + -openssl-linked \ + -I "$OPENSSL_DIR/include" \ + OPENSSL_LIBS="$OPENSSL_DIR/lib/libssl.a $OPENSSL_DIR/lib/libcrypto.a -ldl -lpthread" \ + -nomake examples \ + -nomake tests make $MAKE_THREADS_CNT sudo make install @@ -291,23 +292,23 @@ Go to ***BuildPath*** and run mkdir Debug cd Debug cmake -G Ninja \ - -DCMAKE_BUILD_TYPE=Debug \ - -DTG_OWT_SPECIAL_TARGET=linux \ - -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/include \ - -DTG_OWT_OPENSSL_INCLUDE_PATH=/usr/local/desktop-app/openssl-1.1.1/include \ - -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus \ - -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include ../.. + -DCMAKE_BUILD_TYPE=Debug \ + -DTG_OWT_SPECIAL_TARGET=linux \ + -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/include \ + -DTG_OWT_OPENSSL_INCLUDE_PATH=/usr/local/desktop-app/openssl-1.1.1/include \ + -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus \ + -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include ../.. ninja cd .. mkdir Release cd Release cmake -G Ninja \ - -DCMAKE_BUILD_TYPE=Release \ - -DTG_OWT_SPECIAL_TARGET=linux \ - -DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt_5_12_8/qtbase/src/3rdparty/libjpeg \ - -DTG_OWT_OPENSSL_INCLUDE_PATH=/usr/local/desktop-app/openssl-1.1.1/include \ - -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus \ - -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include ../.. + -DCMAKE_BUILD_TYPE=Release \ + -DTG_OWT_SPECIAL_TARGET=linux \ + -DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt_5_12_8/qtbase/src/3rdparty/libjpeg \ + -DTG_OWT_OPENSSL_INCLUDE_PATH=/usr/local/desktop-app/openssl-1.1.1/include \ + -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus \ + -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include ../.. ninja cd ../../.. diff --git a/docs/building-msvc.md b/docs/building-msvc.md index 1bc58046c4..798cade8fe 100644 --- a/docs/building-msvc.md +++ b/docs/building-msvc.md @@ -61,8 +61,6 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** mkdir Libraries cd Libraries - SET LibrariesPath=%cd% - git clone https://github.com/desktop-app/patches.git cd patches git checkout ddd4084 @@ -162,6 +160,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** SET PATH=%PATH_BACKUP_% cd .. + SET LibrariesPath=%cd% git clone git://code.qt.io/qt/qt5.git qt_5_12_8 cd qt_5_12_8 perl init-repository --module-subset=qtbase,qtimageformats @@ -171,7 +170,27 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** for /r %i in (..\..\patches\qtbase_5_12_8\*) do git apply %i cd .. - configure -prefix "%LibrariesPath%\Qt-5.12.8" -debug-and-release -force-debug-info -opensource -confirm-license -static -static-runtime -I "%LibrariesPath%\openssl_1_1_1\include" -no-opengl -openssl-linked OPENSSL_LIBS_DEBUG="%LibrariesPath%\openssl_1_1_1\out32.dbg\libssl.lib %LibrariesPath%\openssl_1_1_1\out32.dbg\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" OPENSSL_LIBS_RELEASE="%LibrariesPath%\openssl_1_1_1\out32\libssl.lib %LibrariesPath%\openssl_1_1_1\out32\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" -mp -nomake examples -nomake tests -platform win32-msvc -I "%LibrariesPath%\mozjpeg" LIBJPEG_LIBS_DEBUG="%LibrariesPath%\mozjpeg\Debug\jpeg-static.lib" LIBJPEG_LIBS_RELEASE="%LibrariesPath%\mozjpeg\Release\jpeg-static.lib" + configure ^ + -prefix "%LibrariesPath%\Qt-5.12.8" ^ + -debug-and-release ^ + -force-debug-info ^ + -opensource ^ + -confirm-license ^ + -static ^ + -static-runtime ^ + -no-opengl ^ + -openssl-linked ^ + -recheck ^ + -I "%LibrariesPath%\openssl_1_1_1\include" ^ + OPENSSL_LIBS_DEBUG="%LibrariesPath%\openssl_1_1_1\out32.dbg\libssl.lib %LibrariesPath%\openssl_1_1_1\out32.dbg\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" ^ + OPENSSL_LIBS_RELEASE="%LibrariesPath%\openssl_1_1_1\out32\libssl.lib %LibrariesPath%\openssl_1_1_1\out32\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" ^ + -I "%LibrariesPath%\mozjpeg" ^ + LIBJPEG_LIBS_DEBUG="%LibrariesPath%\mozjpeg\Debug\jpeg-static.lib" ^ + LIBJPEG_LIBS_RELEASE="%LibrariesPath%\mozjpeg\Release\jpeg-static.lib" ^ + -mp ^ + -nomake examples ^ + -nomake tests ^ + -platform win32-msvc jom -j4 jom -j4 install @@ -184,23 +203,23 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** mkdir Debug cd Debug cmake -G Ninja ^ - -DCMAKE_BUILD_TYPE=Debug ^ - -DTG_OWT_SPECIAL_TARGET=win ^ - -DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../mozjpeg ^ - -DTG_OWT_OPENSSL_INCLUDE_PATH=%cd%/../../../openssl_1_1_1/include ^ - -DTG_OWT_OPUS_INCLUDE_PATH=%cd%/../../../opus/include ^ - -DTG_OWT_FFMPEG_INCLUDE_PATH=%cd%/../../../ffmpeg ../.. + -DCMAKE_BUILD_TYPE=Debug ^ + -DTG_OWT_SPECIAL_TARGET=win ^ + -DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../mozjpeg ^ + -DTG_OWT_OPENSSL_INCLUDE_PATH=%cd%/../../../openssl_1_1_1/include ^ + -DTG_OWT_OPUS_INCLUDE_PATH=%cd%/../../../opus/include ^ + -DTG_OWT_FFMPEG_INCLUDE_PATH=%cd%/../../../ffmpeg ../.. ninja cd .. mkdir Release cd Release cmake -G Ninja ^ - -DCMAKE_BUILD_TYPE=Release ^ - -DTG_OWT_SPECIAL_TARGET=win ^ - -DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../mozjpeg ^ - -DTG_OWT_OPENSSL_INCLUDE_PATH=%cd%/../../../openssl_1_1_1/include ^ - -DTG_OWT_OPUS_INCLUDE_PATH=%cd%/../../../opus/include ^ - -DTG_OWT_FFMPEG_INCLUDE_PATH=%cd%/../../../ffmpeg ../.. + -DCMAKE_BUILD_TYPE=Release ^ + -DTG_OWT_SPECIAL_TARGET=win ^ + -DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../mozjpeg ^ + -DTG_OWT_OPENSSL_INCLUDE_PATH=%cd%/../../../openssl_1_1_1/include ^ + -DTG_OWT_OPUS_INCLUDE_PATH=%cd%/../../../opus/include ^ + -DTG_OWT_FFMPEG_INCLUDE_PATH=%cd%/../../../ffmpeg ../.. ninja cd ..\..\.. diff --git a/docs/building-osx.md b/docs/building-osx.md index e2b263dfc8..6537f69402 100644 --- a/docs/building-osx.md +++ b/docs/building-osx.md @@ -1,6 +1,6 @@ ## Build instructions for Xcode 10.1 -**NB** These are used for OS X 10.10/10.11 build, after the [Building using Xcode][xcode] instructions. +**NB** These are outdated, please refer to [Building using Xcode][xcode] instructions. ### Prepare folder diff --git a/docs/building-xcode.md b/docs/building-xcode.md index 1f47962afa..dae91359eb 100644 --- a/docs/building-xcode.md +++ b/docs/building-xcode.md @@ -78,10 +78,10 @@ Go to ***BuildPath*** and run git clone -b v4.0.1-rc2 https://github.com/mozilla/mozjpeg.git cd mozjpeg cmake -B build . \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr/local/macos \ - -DWITH_JPEG8=ON \ - -DPNG_SUPPORTED=OFF + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr/local/macos \ + -DWITH_JPEG8=ON \ + -DPNG_SUPPORTED=OFF cmake --build build $MAKE_THREADS_CNT sudo cmake --install build cd .. @@ -263,20 +263,20 @@ Go to ***BuildPath*** and run cd .. ./configure -prefix "/usr/local/desktop-app/Qt-5.12.8" \ - -debug-and-release \ - -force-debug-info \ - -opensource \ - -confirm-license \ - -static \ - -opengl desktop \ - -no-openssl \ - -securetransport \ - -nomake examples \ - -nomake tests \ - -platform macx-clang \ - -I "/usr/local/macos/include" \ - LIBJPEG_LIBS="/usr/local/macos/lib/libjpeg.a" \ - ZLIB_LIBS="/usr/local/macos/lib/libz.a" + -debug-and-release \ + -force-debug-info \ + -opensource \ + -confirm-license \ + -static \ + -opengl desktop \ + -no-openssl \ + -securetransport \ + -I "/usr/local/macos/include" \ + LIBJPEG_LIBS="/usr/local/macos/lib/libjpeg.a" \ + ZLIB_LIBS="/usr/local/macos/lib/libz.a" \ + -nomake examples \ + -nomake tests \ + -platform macx-clang make $MAKE_THREADS_CNT sudo make install @@ -289,23 +289,23 @@ Go to ***BuildPath*** and run mkdir Debug cd Debug cmake -G Ninja \ - -DCMAKE_BUILD_TYPE=Debug \ - -DTG_OWT_SPECIAL_TARGET=mac \ - -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/macos/include \ - -DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_1_1_1/include \ - -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/macos/include/opus \ - -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/macos/include ../.. + -DCMAKE_BUILD_TYPE=Debug \ + -DTG_OWT_SPECIAL_TARGET=mac \ + -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/macos/include \ + -DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_1_1_1/include \ + -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/macos/include/opus \ + -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/macos/include ../.. ninja cd .. mkdir Release cd Release cmake -G Ninja \ - -DCMAKE_BUILD_TYPE=Release \ - -DTG_OWT_SPECIAL_TARGET=mac \ - -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/macos/include \ - -DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_1_1_1/include \ - -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/macos/include/opus \ - -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/macos/include ../.. + -DCMAKE_BUILD_TYPE=Release \ + -DTG_OWT_SPECIAL_TARGET=mac \ + -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/macos/include \ + -DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_1_1_1/include \ + -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/macos/include/opus \ + -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/macos/include ../.. ninja cd ../../..