RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix build scripts on Windows.

This commit is contained in:
John Preston 2023-03-10 10:05:05 +04:00
parent 4b57cbb9f7
commit 83ea3a4b21
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/build/docker/centos_env/Dockerfile
View File

@ -57,7 +57,7 @@ ENV CXXFLAGS $CFLAGS
FROM builder AS patches FROM builder AS patches
RUN git clone {{ GIT }}/desktop-app/patches.git \ RUN git clone {{ GIT }}/desktop-app/patches.git \
&& cd patches \ && cd patches \
&& git checkout 73f5d4762f \ && git checkout 4b35c02c5e \
&& rm -rf .git && rm -rf .git
FROM builder AS nasm FROM builder AS nasm
@ -490,7 +490,7 @@ COPY --link --from=nv-codec-headers {{ LibrariesPath }}/nv-codec-headers-cache /
RUN git init ffmpeg \ RUN git init ffmpeg \
&& cd ffmpeg \ && cd ffmpeg \
&& git remote add origin {{ GIT }}/FFmpeg/FFmpeg.git \ && git remote add origin {{ GIT }}/FFmpeg/FFmpeg.git \
&& git fetch --depth=1 origin cc33e73618a981de7fd96385ecb34719de031f16 \ && git fetch --depth=1 origin 7268323193d55365f914de39fadd5dbdb1f68976 \
&& git reset --hard FETCH_HEAD \ && git reset --hard FETCH_HEAD \
&& ./configure \ && ./configure \
--extra-cflags="-DCONFIG_SAFE_BITSTREAM_READER=1" \ --extra-cflags="-DCONFIG_SAFE_BITSTREAM_READER=1" \

2
Telegram/build/prepare/prepare.py
View File

@ -404,7 +404,7 @@ if customRunCommand:
stage('patches', """ stage('patches', """
git clone https://github.com/desktop-app/patches.git git clone https://github.com/desktop-app/patches.git
cd patches cd patches
git checkout 73f5d4762f git checkout 4b35c02c5e
""") """)
stage('msys64', """ stage('msys64', """