Replaced origin webrtc with custom-built fork in Github CI.
Updated building docs.
This commit is contained in:
parent
7b1c47ff2e
commit
97076dbf83
|
@ -97,7 +97,7 @@ jobs:
|
||||||
autoconf automake build-essential libxml2-dev libass-dev libfreetype6-dev \
|
autoconf automake build-essential libxml2-dev libass-dev libfreetype6-dev \
|
||||||
libgpac-dev libsdl1.2-dev libtheora-dev libtool libva-dev libvdpau-dev \
|
libgpac-dev libsdl1.2-dev libtheora-dev libtool libva-dev libvdpau-dev \
|
||||||
libvorbis-dev libxcb1-dev libxcb-image0-dev libxcb-shm0-dev \
|
libvorbis-dev libxcb1-dev libxcb-image0-dev libxcb-shm0-dev \
|
||||||
libxcb-screensaver0-dev libjpeg-dev \
|
libxcb-screensaver0-dev libjpeg-dev ninja-build \
|
||||||
libxcb-xfixes0-dev libxcb-keysyms1-dev libxcb-icccm4-dev libatspi2.0-dev \
|
libxcb-xfixes0-dev libxcb-keysyms1-dev libxcb-icccm4-dev libatspi2.0-dev \
|
||||||
libxcb-render-util0-dev libxcb-util0-dev libxcb-xkb-dev libxrender-dev \
|
libxcb-render-util0-dev libxcb-util0-dev libxcb-xkb-dev libxrender-dev \
|
||||||
libasound-dev libpulse-dev libxcb-sync0-dev libxcb-randr0-dev libegl1-mesa-dev \
|
libasound-dev libpulse-dev libxcb-sync0-dev libxcb-randr0-dev libegl1-mesa-dev \
|
||||||
|
@ -518,48 +518,33 @@ jobs:
|
||||||
id: cache-webrtc
|
id: cache-webrtc
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v2
|
||||||
with:
|
with:
|
||||||
path: ${{ env.LibrariesPath }}/webrtc
|
path: ${{ env.LibrariesPath }}/tg_owt
|
||||||
key: ${{ runner.OS }}-webrtc-${{ env.CACHE_KEY }}-${{ hashFiles('**/patches/webrtc/*') }}
|
key: ${{ runner.OS }}-webrtc-${{ env.CACHE_KEY }}
|
||||||
- name: WebRTC.
|
- name: WebRTC.
|
||||||
if: steps.cache-webrtc.outputs.cache-hit != 'true'
|
if: steps.cache-webrtc.outputs.cache-hit != 'true'
|
||||||
run: |
|
run: |
|
||||||
cd $LibrariesPath
|
cd $LibrariesPath
|
||||||
|
|
||||||
# # OpenSSL.
|
git clone $GIT/desktop-app/tg_owt.git
|
||||||
# opensslDir=openssl_${OPENSSL_VER}
|
mkdir -p tg_owt/out/Debug
|
||||||
# mkdir $opensslDir
|
cd tg_owt/out/Debug
|
||||||
# cp -R $OPENSSL_PREFIX/ $opensslDir/
|
cmake -G Ninja \
|
||||||
# cd openssl-cache
|
-DCMAKE_BUILD_TYPE=Debug \
|
||||||
# cp $(find . | grep libssl.a) $LibrariesPath/$opensslDir
|
-DTG_OWT_SPECIAL_TARGET=linux \
|
||||||
# cp $(find . | grep libcrypto.a) $LibrariesPath/$opensslDir
|
-DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt_$QT/qtbase/src/3rdparty/libjpeg \
|
||||||
|
-DTG_OWT_OPENSSL_INCLUDE_PATH=$OPENSSL_PREFIX/include \
|
||||||
# cd $LibrariesPath
|
-DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus \
|
||||||
|
-DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include \
|
||||||
git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
|
../..
|
||||||
export PATH=`pwd`/depot_tools:$PATH
|
ninja
|
||||||
|
|
||||||
mkdir webrtc
|
|
||||||
cd webrtc
|
|
||||||
cp ../patches/webrtc/.gclient ./
|
|
||||||
git clone https://github.com/open-webrtc-toolkit/owt-deps-webrtc src
|
|
||||||
gclient sync --no-history
|
|
||||||
|
|
||||||
applyPatch() {
|
|
||||||
cd $LibrariesPath/webrtc/$1
|
|
||||||
git apply $LibrariesPath/patches/webrtc/$(basename $1).diff
|
|
||||||
}
|
|
||||||
applyPatch src
|
|
||||||
applyPatch src/build
|
|
||||||
applyPatch src/third_party
|
|
||||||
applyPatch src/third_party/libsrtp
|
|
||||||
|
|
||||||
cd $LibrariesPath/webrtc/src
|
|
||||||
../../patches/webrtc/configure.sh
|
|
||||||
|
|
||||||
ninja -C out/Debug webrtc
|
|
||||||
|
|
||||||
# Cleanup.
|
# Cleanup.
|
||||||
../../patches/webrtc/cleanup_webrtc.sh
|
cd $LibrariesPath/tg_owt
|
||||||
|
mv out/Debug/libtg_owt.a libtg_owt.a
|
||||||
|
rm -rf out
|
||||||
|
mkdir -p out/Debug
|
||||||
|
mv libtg_owt.a out/Debug/libtg_owt.a
|
||||||
|
|
||||||
rm -rf $LibrariesPath/openssl_${OPENSSL_VER}
|
rm -rf $LibrariesPath/openssl_${OPENSSL_VER}
|
||||||
|
|
||||||
- name: Telegram Desktop build.
|
- name: Telegram Desktop build.
|
||||||
|
|
|
@ -154,7 +154,7 @@ jobs:
|
||||||
$MIN_MAC
|
$MIN_MAC
|
||||||
make build_libs -j$(nproc)
|
make build_libs -j$(nproc)
|
||||||
|
|
||||||
SSL_DIR=$LibrariesPath/openssl_${{ env.OPENSSL_VER }}
|
SSL_DIR=$LibrariesPath/openssl_$OPENSSL_VER
|
||||||
mkdir -p $SSL_DIR/include
|
mkdir -p $SSL_DIR/include
|
||||||
copyLib() {
|
copyLib() {
|
||||||
cp $1.a $SSL_DIR/$1.a
|
cp $1.a $SSL_DIR/$1.a
|
||||||
|
@ -453,36 +453,31 @@ jobs:
|
||||||
id: cache-webrtc
|
id: cache-webrtc
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v2
|
||||||
with:
|
with:
|
||||||
path: ${{ env.LibrariesPath }}/webrtc
|
path: ${{ env.LibrariesPath }}/tg_owt
|
||||||
key: ${{ runner.OS }}-webrtc-${{ env.CACHE_KEY }}-${{ hashFiles('**/patches/webrtc/*') }}
|
key: ${{ runner.OS }}-webrtc-${{ env.CACHE_KEY }}
|
||||||
- name: WebRTC.
|
- name: WebRTC.
|
||||||
if: steps.cache-webrtc.outputs.cache-hit != 'true'
|
if: steps.cache-webrtc.outputs.cache-hit != 'true'
|
||||||
run: |
|
run: |
|
||||||
cd $LibrariesPath
|
cd $LibrariesPath
|
||||||
|
|
||||||
git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
|
git clone $GIT/desktop-app/tg_owt.git
|
||||||
export PATH=`pwd`/depot_tools:$PATH
|
mkdir -p tg_owt/out/Debug
|
||||||
|
cd tg_owt/out/Debug
|
||||||
|
cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug \
|
||||||
|
-DTG_OWT_SPECIAL_TARGET=mac \
|
||||||
|
-DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt_$QT/qtbase/src/3rdparty/libjpeg \
|
||||||
|
-DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_$OPENSSL_VER/include \
|
||||||
|
-DTG_OWT_OPUS_INCLUDE_PATH=$PREFIX/include/opus \
|
||||||
|
-DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include \
|
||||||
|
../..
|
||||||
|
ninja
|
||||||
|
|
||||||
mkdir webrtc
|
# Cleanup.
|
||||||
cd webrtc
|
cd $LibrariesPath/tg_owt
|
||||||
cp ../patches/webrtc/.gclient ./
|
mv out/Debug/libtg_owt.a libtg_owt.a
|
||||||
git clone https://github.com/open-webrtc-toolkit/owt-deps-webrtc src
|
rm -rf out
|
||||||
gclient sync --no-history
|
mkdir -p out/Debug
|
||||||
|
mv libtg_owt.a out/Debug/libtg_owt.a
|
||||||
applyPatch() {
|
|
||||||
cd $LibrariesPath/webrtc/$1
|
|
||||||
git apply $LibrariesPath/patches/webrtc/$(basename $1).diff
|
|
||||||
}
|
|
||||||
applyPatch src
|
|
||||||
applyPatch src/build
|
|
||||||
applyPatch src/third_party
|
|
||||||
applyPatch src/third_party/libsrtp
|
|
||||||
|
|
||||||
cd $LibrariesPath/webrtc/src
|
|
||||||
../../patches/webrtc/configure.sh
|
|
||||||
|
|
||||||
ninja -C out/Debug webrtc
|
|
||||||
../../patches/webrtc/cleanup_webrtc.sh
|
|
||||||
|
|
||||||
- name: Telegram Desktop build.
|
- name: Telegram Desktop build.
|
||||||
if: env.ONLY_CACHE == 'false'
|
if: env.ONLY_CACHE == 'false'
|
||||||
|
|
|
@ -316,7 +316,7 @@ jobs:
|
||||||
for /r %%i in (..\..\patches\qtbase_%QT%\*) do git apply %%i
|
for /r %%i in (..\..\patches\qtbase_%QT%\*) do git apply %%i
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
SET SSL=%LibrariesPath%\openssl_1_1_1
|
SET SSL=%LibrariesPath%\openssl_%OPENSSL_VER%
|
||||||
SET LIBS=libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib
|
SET LIBS=libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib
|
||||||
|
|
||||||
configure ^
|
configure ^
|
||||||
|
@ -352,15 +352,15 @@ jobs:
|
||||||
id: cache-webrtc
|
id: cache-webrtc
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v2
|
||||||
with:
|
with:
|
||||||
path: ${{ env.LibrariesPath }}/webrtc
|
path: ${{ env.LibrariesPath }}/tg_owt
|
||||||
key: ${{ runner.OS }}-webrtc-2-${{ env.CACHE_KEY }}-${{ hashFiles('**/patches/webrtc/*') }}
|
key: ${{ runner.OS }}-webrtc-${{ env.CACHE_KEY }}
|
||||||
- name: WebRTC.
|
- name: WebRTC.
|
||||||
if: steps.cache-webrtc.outputs.cache-hit != 'true'
|
if: steps.cache-webrtc.outputs.cache-hit != 'true'
|
||||||
shell: cmd
|
shell: cmd
|
||||||
run: |
|
run: |
|
||||||
%VC%
|
%VC%
|
||||||
|
|
||||||
# Qt libjpeg.
|
:: Qt libjpeg.
|
||||||
mkdir qt_%QT%
|
mkdir qt_%QT%
|
||||||
cd qt_%QT%
|
cd qt_%QT%
|
||||||
git clone -b %QT_VER% https://github.com/qt/qtbase
|
git clone -b %QT_VER% https://github.com/qt/qtbase
|
||||||
|
@ -372,37 +372,30 @@ jobs:
|
||||||
mkdir qt_%QT%\qtbase\src\3rdparty\
|
mkdir qt_%QT%\qtbase\src\3rdparty\
|
||||||
move libjpeg qt_%QT%\qtbase\src\3rdparty\
|
move libjpeg qt_%QT%\qtbase\src\3rdparty\
|
||||||
|
|
||||||
# Depot tools.
|
:: WebRTC.
|
||||||
cd %LibrariesPath%
|
cd %LibrariesPath%
|
||||||
|
|
||||||
curl -O https://storage.googleapis.com/chrome-infra/depot_tools.zip
|
git clone %GIT%/desktop-app/tg_owt.git
|
||||||
7z x depot_tools.zip
|
mkdir tg_owt\out\Debug
|
||||||
cd depot_tools
|
cd tg_owt\out\Debug
|
||||||
SET PATH=%PY2%;%cd%;%PATH%
|
cmake -G Ninja ^
|
||||||
SET DEPOT_TOOLS_WIN_TOOLCHAIN=0
|
-DCMAKE_BUILD_TYPE=Debug ^
|
||||||
|
-DTG_OWT_SPECIAL_TARGET=win ^
|
||||||
|
-DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../qt_%QT%/qtbase/src/3rdparty/libjpeg ^
|
||||||
|
-DTG_OWT_OPENSSL_INCLUDE_PATH=%cd%/../../../openssl_%OPENSSL_VER%/include ^
|
||||||
|
-DTG_OWT_OPUS_INCLUDE_PATH=%cd%/../../../opus/include ^
|
||||||
|
-DTG_OWT_FFMPEG_INCLUDE_PATH=%cd%/../../../ffmpeg ^
|
||||||
|
../..
|
||||||
|
|
||||||
# WebRTC.
|
ninja
|
||||||
cd %LibrariesPath%
|
|
||||||
|
|
||||||
mkdir webrtc
|
:: Cleanup.
|
||||||
cd webrtc
|
cd %LibrariesPath%\tg_owt
|
||||||
copy ..\patches\webrtc\.gclient .gclient
|
move out\Debug\tg_owt.lib tg_owt.lib
|
||||||
git clone https://github.com/open-webrtc-toolkit/owt-deps-webrtc src
|
rmdir /S /Q out
|
||||||
gclient sync --no-history
|
mkdir out\Debug
|
||||||
cd src
|
move tg_owt.lib out\Debug\tg_owt.lib
|
||||||
git apply ..\..\patches\webrtc\src.diff
|
|
||||||
cd build
|
|
||||||
git apply ..\..\..\patches\webrtc\build.diff
|
|
||||||
cd ..\third_party
|
|
||||||
git apply ..\..\..\patches\webrtc\third_party.diff
|
|
||||||
cd libsrtp
|
|
||||||
git apply ..\..\..\..\patches\webrtc\libsrtp.diff
|
|
||||||
cd ..\..
|
|
||||||
..\..\patches\webrtc\configure.bat
|
|
||||||
ninja -C out/Debug webrtc
|
|
||||||
|
|
||||||
# Cleanup.
|
|
||||||
..\..\patches\webrtc\cleanup_webrtc.bat
|
|
||||||
cd %LibrariesPath%
|
cd %LibrariesPath%
|
||||||
rmdir /S /Q qt_%QT%
|
rmdir /S /Q qt_%QT%
|
||||||
|
|
||||||
|
|
|
@ -17,10 +17,11 @@ You will need GCC 8 installed. To install them and all the required dependencies
|
||||||
libgtk2.0-dev libice-dev libsm-dev libicu-dev libdrm-dev dh-autoreconf \
|
libgtk2.0-dev libice-dev libsm-dev libicu-dev libdrm-dev dh-autoreconf \
|
||||||
autoconf automake build-essential libxml2-dev libass-dev libfreetype6-dev \
|
autoconf automake build-essential libxml2-dev libass-dev libfreetype6-dev \
|
||||||
libgpac-dev libsdl1.2-dev libtheora-dev libtool libva-dev libvdpau-dev \
|
libgpac-dev libsdl1.2-dev libtheora-dev libtool libva-dev libvdpau-dev \
|
||||||
libvorbis-dev libxcb1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-screensaver0-dev \
|
libvorbis-dev libxcb1-dev libxcb-image0-dev libxcb-shm0-dev \
|
||||||
|
libxcb-screensaver0-dev ninja-build libegl1-mesa-dev \
|
||||||
libxcb-xfixes0-dev libxcb-keysyms1-dev libxcb-icccm4-dev libatspi2.0-dev \
|
libxcb-xfixes0-dev libxcb-keysyms1-dev libxcb-icccm4-dev libatspi2.0-dev \
|
||||||
libxcb-render-util0-dev libxcb-util0-dev libxcb-xkb-dev libxrender-dev \
|
libxcb-render-util0-dev libxcb-util0-dev libxcb-xkb-dev libxrender-dev \
|
||||||
libasound-dev libpulse-dev libxcb-sync0-dev libxcb-randr0-dev libegl1-mesa-dev \
|
libasound-dev libpulse-dev libxcb-sync0-dev libxcb-randr0-dev \
|
||||||
libx11-xcb-dev libffi-dev libncurses5-dev pkg-config texi2html bison yasm \
|
libx11-xcb-dev libffi-dev libncurses5-dev pkg-config texi2html bison yasm \
|
||||||
zlib1g-dev xutils-dev python-xcbgen chrpath gperf -y --force-yes && \
|
zlib1g-dev xutils-dev python-xcbgen chrpath gperf -y --force-yes && \
|
||||||
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
|
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
|
||||||
|
@ -279,36 +280,26 @@ Go to ***BuildPath*** and run
|
||||||
cd out
|
cd out
|
||||||
mkdir Debug
|
mkdir Debug
|
||||||
cd Debug
|
cd Debug
|
||||||
cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -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 ../..
|
cmake -G Ninja \
|
||||||
|
-DCMAKE_BUILD_TYPE=Debug \
|
||||||
|
-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
|
ninja
|
||||||
cd ..
|
cd ..
|
||||||
mkdir Release
|
mkdir Release
|
||||||
cd Release
|
cd Release
|
||||||
cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DTG_OWT_SPECIAL_TARGET=mac -DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt_5_12_8/qtbase/src/3rdparty/libjpeg -DTG_OWT_OPENSSL_INCLUDE_PATH=$LibrariesPath/openssl_1_1_1/include -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/macos/include/opus -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/macos/include ../..
|
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 ../..
|
||||||
ninja
|
ninja
|
||||||
cd ..\..
|
cd ../../..
|
||||||
|
|
||||||
git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
|
|
||||||
export PATH=`pwd`/depot_tools:$PATH
|
|
||||||
|
|
||||||
mkdir webrtc
|
|
||||||
cd webrtc
|
|
||||||
cp ../patches/webrtc/.gclient ./
|
|
||||||
git clone https://github.com/open-webrtc-toolkit/owt-deps-webrtc src
|
|
||||||
gclient sync --no-history
|
|
||||||
cd src
|
|
||||||
git apply ../../patches/webrtc/src.diff
|
|
||||||
cd build
|
|
||||||
git apply ../../../patches/webrtc/build.diff
|
|
||||||
cd ../third_party
|
|
||||||
git apply ../../../patches/webrtc/third_party.diff
|
|
||||||
cd libsrtp
|
|
||||||
git apply ../../../../patches/webrtc/libsrtp.diff
|
|
||||||
cd ../..
|
|
||||||
../../patches/webrtc/configure.sh
|
|
||||||
ninja -C out/Debug webrtc
|
|
||||||
ninja -C out/Release webrtc
|
|
||||||
cd ../..
|
|
||||||
|
|
||||||
git clone https://chromium.googlesource.com/external/gyp
|
git clone https://chromium.googlesource.com/external/gyp
|
||||||
cd gyp
|
cd gyp
|
||||||
|
|
|
@ -27,7 +27,6 @@ You will require **api_id** and **api_hash** to access the Telegram API servers.
|
||||||
* Download **CMake** installer from [https://cmake.org/download/](https://cmake.org/download/) and install to ***BuildPath*\\ThirdParty\\cmake**
|
* Download **CMake** installer from [https://cmake.org/download/](https://cmake.org/download/) and install to ***BuildPath*\\ThirdParty\\cmake**
|
||||||
* Download **Ninja** executable from [https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip](https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip) and unpack to ***BuildPath*\\ThirdParty\\Ninja**
|
* Download **Ninja** executable from [https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip](https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip) and unpack to ***BuildPath*\\ThirdParty\\Ninja**
|
||||||
* Download **Git** installer from [https://git-scm.com/download/win](https://git-scm.com/download/win) and install it.
|
* Download **Git** installer from [https://git-scm.com/download/win](https://git-scm.com/download/win) and install it.
|
||||||
* Download **depot_tools** archive from [https://storage.googleapis.com/chrome-infra/depot_tools.zip](https://storage.googleapis.com/chrome-infra/depot_tools.zip) and unpack to ***BuildPath*\\ThirdParty\\depot_tools**
|
|
||||||
|
|
||||||
Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** and run
|
Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** and run
|
||||||
|
|
||||||
|
@ -48,7 +47,6 @@ Add **GYP** and **Ninja** to your PATH:
|
||||||
* Press **Environment Variables...**
|
* Press **Environment Variables...**
|
||||||
* Select **Path**
|
* Select **Path**
|
||||||
* Press **Edit**
|
* Press **Edit**
|
||||||
* Add ***BuildPath*\\ThirdParty\\depot_tools** value
|
|
||||||
* Add ***BuildPath*\\ThirdParty\\gyp** value
|
* Add ***BuildPath*\\ThirdParty\\gyp** value
|
||||||
* Add ***BuildPath*\\ThirdParty\\Ninja** value
|
* Add ***BuildPath*\\ThirdParty\\Ninja** value
|
||||||
|
|
||||||
|
@ -56,7 +54,7 @@ Add **GYP** and **Ninja** to your PATH:
|
||||||
|
|
||||||
Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** and run
|
Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** and run
|
||||||
|
|
||||||
SET PATH=%cd%\ThirdParty\depot_tools;%cd%\ThirdParty\Strawberry\perl\bin;%cd%\ThirdParty\Python27;%cd%\ThirdParty\NASM;%cd%\ThirdParty\jom;%cd%\ThirdParty\cmake\bin;%cd%\ThirdParty\yasm;%PATH%
|
SET PATH=%cd%\ThirdParty\Strawberry\perl\bin;%cd%\ThirdParty\Python27;%cd%\ThirdParty\NASM;%cd%\ThirdParty\jom;%cd%\ThirdParty\cmake\bin;%cd%\ThirdParty\yasm;%PATH%
|
||||||
|
|
||||||
git clone --recursive https://github.com/telegramdesktop/tdesktop.git
|
git clone --recursive https://github.com/telegramdesktop/tdesktop.git
|
||||||
|
|
||||||
|
@ -171,14 +169,26 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
|
||||||
cd out
|
cd out
|
||||||
mkdir Debug
|
mkdir Debug
|
||||||
cd Debug
|
cd Debug
|
||||||
cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DTG_OWT_SPECIAL_TARGET=win -DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../qt_5_12_8/qtbase/src/3rdparty/libjpeg -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 ../..
|
cmake -G Ninja ^
|
||||||
|
-DCMAKE_BUILD_TYPE=Debug ^
|
||||||
|
-DTG_OWT_SPECIAL_TARGET=win ^
|
||||||
|
-DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../qt_5_12_8/qtbase/src/3rdparty/libjpeg ^
|
||||||
|
-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
|
ninja
|
||||||
cd ..
|
cd ..
|
||||||
mkdir Release
|
mkdir Release
|
||||||
cd Release
|
cd Release
|
||||||
cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DTG_OWT_SPECIAL_TARGET=win -DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../qt_5_12_8/qtbase/src/3rdparty/libjpeg -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 ../..
|
cmake -G Ninja ^
|
||||||
|
-DCMAKE_BUILD_TYPE=Release ^
|
||||||
|
-DTG_OWT_SPECIAL_TARGET=win ^
|
||||||
|
-DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../qt_5_12_8/qtbase/src/3rdparty/libjpeg ^
|
||||||
|
-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
|
ninja
|
||||||
cd ..\..
|
cd ..\..\..
|
||||||
|
|
||||||
## Build the project
|
## Build the project
|
||||||
|
|
||||||
|
|
|
@ -251,14 +251,26 @@ Go to ***BuildPath*** and run
|
||||||
cd out
|
cd out
|
||||||
mkdir Debug
|
mkdir Debug
|
||||||
cd Debug
|
cd Debug
|
||||||
cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DTG_OWT_SPECIAL_TARGET=osx -DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt5_6_2/qtbase/src/3rdparty/libjpeg -DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_1_1_1/include -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus -DTG_OWT_FFMPEG_INCLUDE_PATH=`pwd`/../../../ffmpeg ../..
|
cmake -G Ninja \
|
||||||
|
-DCMAKE_BUILD_TYPE=Debug \
|
||||||
|
-DTG_OWT_SPECIAL_TARGET=osx \
|
||||||
|
-DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt5_6_2/qtbase/src/3rdparty/libjpeg \
|
||||||
|
-DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_1_1_1/include \
|
||||||
|
-DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus \
|
||||||
|
-DTG_OWT_FFMPEG_INCLUDE_PATH=`pwd`/../../../ffmpeg ../..
|
||||||
ninja
|
ninja
|
||||||
cd ..
|
cd ..
|
||||||
mkdir Release
|
mkdir Release
|
||||||
cd Release
|
cd Release
|
||||||
cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DTG_OWT_SPECIAL_TARGET=osx -DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt5_6_2/qtbase/src/3rdparty/libjpeg -DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_1_1_1/include -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus -DTG_OWT_FFMPEG_INCLUDE_PATH=`pwd`/../../../ffmpeg ../..
|
cmake -G Ninja \
|
||||||
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
|
-DTG_OWT_SPECIAL_TARGET=osx \
|
||||||
|
-DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt5_6_2/qtbase/src/3rdparty/libjpeg \
|
||||||
|
-DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_1_1_1/include \
|
||||||
|
-DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus \
|
||||||
|
-DTG_OWT_FFMPEG_INCLUDE_PATH=`pwd`/../../../ffmpeg ../..
|
||||||
ninja
|
ninja
|
||||||
cd ..\..
|
cd ../../..
|
||||||
|
|
||||||
### Building the project
|
### Building the project
|
||||||
|
|
||||||
|
|
|
@ -274,14 +274,26 @@ Go to ***BuildPath*** and run
|
||||||
cd out
|
cd out
|
||||||
mkdir Debug
|
mkdir Debug
|
||||||
cd Debug
|
cd Debug
|
||||||
cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DTG_OWT_SPECIAL_TARGET=mac -DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt_5_12_8/qtbase/src/3rdparty/libjpeg -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 ../..
|
cmake -G Ninja \
|
||||||
|
-DCMAKE_BUILD_TYPE=Debug \
|
||||||
|
-DTG_OWT_SPECIAL_TARGET=mac \
|
||||||
|
-DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt_5_12_8/qtbase/src/3rdparty/libjpeg \
|
||||||
|
-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
|
ninja
|
||||||
cd ..
|
cd ..
|
||||||
mkdir Release
|
mkdir Release
|
||||||
cd Release
|
cd Release
|
||||||
cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DTG_OWT_SPECIAL_TARGET=mac -DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt_5_12_8/qtbase/src/3rdparty/libjpeg -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 ../..
|
cmake -G Ninja \
|
||||||
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
|
-DTG_OWT_SPECIAL_TARGET=mac \
|
||||||
|
-DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt_5_12_8/qtbase/src/3rdparty/libjpeg \
|
||||||
|
-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
|
ninja
|
||||||
cd ..\..
|
cd ../../..
|
||||||
|
|
||||||
### Building the project
|
### Building the project
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue