diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index 40b596bfb8..0995ff7036 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -278,10 +278,7 @@ RUN git clone -b master --depth=1 {{ GIT }}/desktop-app/rnnoise.git \ && cd rnnoise \ && cmake -GNinja -B build . -DCMAKE_BUILD_TYPE=None \ && cmake --build build --parallel \ - && mkdir -p "{{ LibrariesPath }}/rnnoise-cache/usr/local/include" \ - && cp "include/rnnoise.h" "{{ LibrariesPath }}/rnnoise-cache/usr/local/include/" \ - && mkdir -p "{{ LibrariesPath }}/rnnoise-cache/usr/local/lib" \ - && cp "build/librnnoise.a" "{{ LibrariesPath }}/rnnoise-cache/usr/local/lib/" \ + && DESTDIR="{{ LibrariesPath }}/rnnoise-cache" cmake --install build \ && cd .. \ && rm -rf rnnoise diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index 98929c364f..6640650b55 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -681,11 +681,11 @@ mac: stage('rnnoise', """ git clone https://github.com/desktop-app/rnnoise.git cd rnnoise - git checkout fe37e57d09 + git checkout d8ea2b0 mkdir out cd out win: - cmake -A %WIN32X64% .. + cmake -A %WIN32X64% .. -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$:Debug>" cmake --build . --config Debug --parallel release: cmake --build . --config Release --parallel @@ -694,6 +694,7 @@ release: cd Debug cmake -G Ninja ../.. \\ -D CMAKE_BUILD_TYPE=Debug \\ + -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=$MACOSX_DEPLOYMENT_TARGET \\ -D CMAKE_OSX_ARCHITECTURES="x86_64;arm64" ninja release: @@ -702,6 +703,7 @@ release: cd Release cmake -G Ninja ../.. \\ -D CMAKE_BUILD_TYPE=Release \\ + -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=$MACOSX_DEPLOYMENT_TARGET \\ -D CMAKE_OSX_ARCHITECTURES="x86_64;arm64" ninja """)