mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2025-06-06 15:13:57 +02:00
Update submodules and instructions.
This commit is contained in:
parent
94d37509c1
commit
98afc99a8f
8 changed files with 99 additions and 79 deletions
2
Telegram/ThirdParty/range-v3
vendored
2
Telegram/ThirdParty/range-v3
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit 2d606af5c71a47e91e095db20d8ba2d84a1ca113
|
Subproject commit 413c8f9aacb269f6440fe180b587fd70c7ba16df
|
2
Telegram/ThirdParty/rlottie
vendored
2
Telegram/ThirdParty/rlottie
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit 839dcab7f083a51b8130061ea5ec245195af6c58
|
Subproject commit 3426bf778d306d41b1d1052fa06fa07ba24b2608
|
|
@ -1 +1 @@
|
||||||
Subproject commit 914df12ebe3231dbdd5150d5b33cfab2e7dabe17
|
Subproject commit 109375453e1465daff0970a920ba65e9fe8c78f0
|
2
cmake
2
cmake
|
@ -1 +1 @@
|
||||||
Subproject commit cfc6051fb65da4c67ccbc2a1d9e753758f995fe3
|
Subproject commit a7e73ebc036fdf32cdca56b62405bf9dcd8f8f09
|
|
@ -276,7 +276,8 @@ Go to ***BuildPath*** and run
|
||||||
-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" \
|
||||||
|
OPENSSL_LIBS="$OPENSSL_DIR/lib/libssl.a $OPENSSL_DIR/lib/libcrypto.a -ldl -lpthread" \
|
||||||
-nomake examples \
|
-nomake examples \
|
||||||
-nomake tests
|
-nomake tests
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -271,12 +271,12 @@ Go to ***BuildPath*** and run
|
||||||
-opengl desktop \
|
-opengl desktop \
|
||||||
-no-openssl \
|
-no-openssl \
|
||||||
-securetransport \
|
-securetransport \
|
||||||
-nomake examples \
|
|
||||||
-nomake tests \
|
|
||||||
-platform macx-clang \
|
|
||||||
-I "/usr/local/macos/include" \
|
-I "/usr/local/macos/include" \
|
||||||
LIBJPEG_LIBS="/usr/local/macos/lib/libjpeg.a" \
|
LIBJPEG_LIBS="/usr/local/macos/lib/libjpeg.a" \
|
||||||
ZLIB_LIBS="/usr/local/macos/lib/libz.a"
|
ZLIB_LIBS="/usr/local/macos/lib/libz.a" \
|
||||||
|
-nomake examples \
|
||||||
|
-nomake tests \
|
||||||
|
-platform macx-clang
|
||||||
|
|
||||||
make $MAKE_THREADS_CNT
|
make $MAKE_THREADS_CNT
|
||||||
sudo make install
|
sudo make install
|
||||||
|
|
Loading…
Add table
Reference in a new issue