void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-04-22 00:57:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update submodules and instructions.

Browse source
This commit is contained in:
John Preston 2020-10-30 13:17:02 +03:00
parent 94d37509c1
commit 98afc99a8f
8 changed files with 99 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Telegram/ThirdParty/range-v3 vendored

@ -1 +1 @@
Subproject commit 2d606af5c71a47e91e095db20d8ba2d84a1ca113 Subproject commit 413c8f9aacb269f6440fe180b587fd70c7ba16df

2
Telegram/ThirdParty/rlottie vendored

@ -1 +1 @@
Subproject commit 839dcab7f083a51b8130061ea5ec245195af6c58 Subproject commit 3426bf778d306d41b1d1052fa06fa07ba24b2608

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit 914df12ebe3231dbdd5150d5b33cfab2e7dabe17 Subproject commit 109375453e1465daff0970a920ba65e9fe8c78f0

2
cmake

@ -1 +1 @@
Subproject commit cfc6051fb65da4c67ccbc2a1d9e753758f995fe3 Subproject commit a7e73ebc036fdf32cdca56b62405bf9dcd8f8f09

59
docs/building-cmake.md
View file

@ -262,23 +262,24 @@ Go to ***BuildPath*** and run
OPENSSL_DIR=/usr/local/desktop-app/openssl-1.1.1 OPENSSL_DIR=/usr/local/desktop-app/openssl-1.1.1
./configure -prefix "/usr/local/desktop-app/Qt-5.12.8" \ ./configure -prefix "/usr/local/desktop-app/Qt-5.12.8" \
-release \ -release \
-force-debug-info \ -force-debug-info \
-opensource \ -opensource \
-confirm-license \ -confirm-license \
-qt-zlib \ -qt-zlib \
-qt-libpng \ -qt-libpng \
-qt-harfbuzz \ -qt-harfbuzz \
-qt-pcre \ -qt-pcre \
-qt-xcb \ -qt-xcb \
-no-gtk \ -no-gtk \
-no-icu \ -no-icu \
-static \ -static \
-dbus-runtime \ -dbus-runtime \
-openssl-linked \ -openssl-linked \
-I "$OPENSSL_DIR/include" OPENSSL_LIBS="$OPENSSL_DIR/lib/libssl.a $OPENSSL_DIR/lib/libcrypto.a -ldl -lpthread" \ -I "$OPENSSL_DIR/include" \
-nomake examples \ OPENSSL_LIBS="$OPENSSL_DIR/lib/libssl.a $OPENSSL_DIR/lib/libcrypto.a -ldl -lpthread" \
-nomake tests -nomake examples \
-nomake tests
make $MAKE_THREADS_CNT make $MAKE_THREADS_CNT
sudo make install sudo make install
@ -291,23 +292,23 @@ Go to ***BuildPath*** and run
mkdir Debug mkdir Debug
cd Debug cd Debug
cmake -G Ninja \ cmake -G Ninja \
-DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_BUILD_TYPE=Debug \
-DTG_OWT_SPECIAL_TARGET=linux \ -DTG_OWT_SPECIAL_TARGET=linux \
-DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/include \ -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/include \
-DTG_OWT_OPENSSL_INCLUDE_PATH=/usr/local/desktop-app/openssl-1.1.1/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_OPUS_INCLUDE_PATH=/usr/local/include/opus \
-DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include ../.. -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include ../..
ninja ninja
cd .. cd ..
mkdir Release mkdir Release
cd Release cd Release
cmake -G Ninja \ cmake -G Ninja \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DTG_OWT_SPECIAL_TARGET=linux \ -DTG_OWT_SPECIAL_TARGET=linux \
-DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt_5_12_8/qtbase/src/3rdparty/libjpeg \ -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_OPENSSL_INCLUDE_PATH=/usr/local/desktop-app/openssl-1.1.1/include \
-DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus \ -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus \
-DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include ../.. -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include ../..
ninja ninja
cd ../../.. cd ../../..

49
docs/building-msvc.md
View file

@ -61,8 +61,6 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
mkdir Libraries mkdir Libraries
cd Libraries cd Libraries
SET LibrariesPath=%cd%
git clone https://github.com/desktop-app/patches.git git clone https://github.com/desktop-app/patches.git
cd patches cd patches
git checkout ddd4084 git checkout ddd4084
@ -162,6 +160,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
SET PATH=%PATH_BACKUP_% SET PATH=%PATH_BACKUP_%
cd .. cd ..
SET LibrariesPath=%cd%
git clone git://code.qt.io/qt/qt5.git qt_5_12_8 git clone git://code.qt.io/qt/qt5.git qt_5_12_8
cd qt_5_12_8 cd qt_5_12_8
perl init-repository --module-subset=qtbase,qtimageformats 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 for /r %i in (..\..\patches\qtbase_5_12_8\*) do git apply %i
cd .. 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
jom -j4 install jom -j4 install
@ -184,23 +203,23 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
mkdir Debug mkdir Debug
cd Debug cd Debug
cmake -G Ninja ^ cmake -G Ninja ^
-DCMAKE_BUILD_TYPE=Debug ^ -DCMAKE_BUILD_TYPE=Debug ^
-DTG_OWT_SPECIAL_TARGET=win ^ -DTG_OWT_SPECIAL_TARGET=win ^
-DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../mozjpeg ^ -DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../mozjpeg ^
-DTG_OWT_OPENSSL_INCLUDE_PATH=%cd%/../../../openssl_1_1_1/include ^ -DTG_OWT_OPENSSL_INCLUDE_PATH=%cd%/../../../openssl_1_1_1/include ^
-DTG_OWT_OPUS_INCLUDE_PATH=%cd%/../../../opus/include ^ -DTG_OWT_OPUS_INCLUDE_PATH=%cd%/../../../opus/include ^
-DTG_OWT_FFMPEG_INCLUDE_PATH=%cd%/../../../ffmpeg ../.. -DTG_OWT_FFMPEG_INCLUDE_PATH=%cd%/../../../ffmpeg ../..
ninja ninja
cd .. cd ..
mkdir Release mkdir Release
cd Release cd Release
cmake -G Ninja ^ cmake -G Ninja ^
-DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_BUILD_TYPE=Release ^
-DTG_OWT_SPECIAL_TARGET=win ^ -DTG_OWT_SPECIAL_TARGET=win ^
-DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../mozjpeg ^ -DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../mozjpeg ^
-DTG_OWT_OPENSSL_INCLUDE_PATH=%cd%/../../../openssl_1_1_1/include ^ -DTG_OWT_OPENSSL_INCLUDE_PATH=%cd%/../../../openssl_1_1_1/include ^
-DTG_OWT_OPUS_INCLUDE_PATH=%cd%/../../../opus/include ^ -DTG_OWT_OPUS_INCLUDE_PATH=%cd%/../../../opus/include ^
-DTG_OWT_FFMPEG_INCLUDE_PATH=%cd%/../../../ffmpeg ../.. -DTG_OWT_FFMPEG_INCLUDE_PATH=%cd%/../../../ffmpeg ../..
ninja ninja
cd ..\..\.. cd ..\..\..

2
docs/building-osx.md
View file

@ -1,6 +1,6 @@
## Build instructions for Xcode 10.1 ## 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 ### Prepare folder

60
docs/building-xcode.md
View file

@ -78,10 +78,10 @@ Go to ***BuildPath*** and run
git clone -b v4.0.1-rc2 https://github.com/mozilla/mozjpeg.git git clone -b v4.0.1-rc2 https://github.com/mozilla/mozjpeg.git
cd mozjpeg cd mozjpeg
cmake -B build . \ cmake -B build . \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr/local/macos \ -DCMAKE_INSTALL_PREFIX=/usr/local/macos \
-DWITH_JPEG8=ON \ -DWITH_JPEG8=ON \
-DPNG_SUPPORTED=OFF -DPNG_SUPPORTED=OFF
cmake --build build $MAKE_THREADS_CNT cmake --build build $MAKE_THREADS_CNT
sudo cmake --install build sudo cmake --install build
cd .. cd ..
@ -263,20 +263,20 @@ Go to ***BuildPath*** and run
cd .. cd ..
./configure -prefix "/usr/local/desktop-app/Qt-5.12.8" \ ./configure -prefix "/usr/local/desktop-app/Qt-5.12.8" \
-debug-and-release \ -debug-and-release \
-force-debug-info \ -force-debug-info \
-opensource \ -opensource \
-confirm-license \ -confirm-license \
-static \ -static \
-opengl desktop \ -opengl desktop \
-no-openssl \ -no-openssl \
-securetransport \ -securetransport \
-nomake examples \ -I "/usr/local/macos/include" \
-nomake tests \ LIBJPEG_LIBS="/usr/local/macos/lib/libjpeg.a" \
-platform macx-clang \ ZLIB_LIBS="/usr/local/macos/lib/libz.a" \
-I "/usr/local/macos/include" \ -nomake examples \
LIBJPEG_LIBS="/usr/local/macos/lib/libjpeg.a" \ -nomake tests \
ZLIB_LIBS="/usr/local/macos/lib/libz.a" -platform macx-clang
make $MAKE_THREADS_CNT make $MAKE_THREADS_CNT
sudo make install sudo make install
@ -289,23 +289,23 @@ Go to ***BuildPath*** and run
mkdir Debug mkdir Debug
cd Debug cd Debug
cmake -G Ninja \ cmake -G Ninja \
-DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_BUILD_TYPE=Debug \
-DTG_OWT_SPECIAL_TARGET=mac \ -DTG_OWT_SPECIAL_TARGET=mac \
-DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/macos/include \ -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/macos/include \
-DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_1_1_1/include \ -DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_1_1_1/include \
-DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/macos/include/opus \ -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/macos/include/opus \
-DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/macos/include ../.. -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/macos/include ../..
ninja ninja
cd .. cd ..
mkdir Release mkdir Release
cd Release cd Release
cmake -G Ninja \ cmake -G Ninja \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DTG_OWT_SPECIAL_TARGET=mac \ -DTG_OWT_SPECIAL_TARGET=mac \
-DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/macos/include \ -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/macos/include \
-DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_1_1_1/include \ -DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_1_1_1/include \
-DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/macos/include/opus \ -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/macos/include/opus \
-DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/macos/include ../.. -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/macos/include ../..
ninja ninja
cd ../../.. cd ../../..