fix for windows build

mpromonet · Dec 20, 2024 · 299848a · 299848a
1 parent ea4054d
commit 299848a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -50,7 +50,9 @@ jobs:
       - run: apt-get update; DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates wget python3 python3-pkg-resources autoconf automake libtool git cmake make g++ xz-utils libgtk-3-dev libxtst-dev libasound2-dev libpulse-dev
       - run: echo 'export PATH=/depot_tools:$PATH' >> $BASH_ENV
 
-      - run: cmake -DCMAKE_BUILD_TYPE=<< parameters.buildtype >> . && make && cpack 
+      - run: 
+          command: cmake -DCMAKE_BUILD_TYPE=<< parameters.buildtype >> . && make && cpack 
+          no_output_timeout: 1h
 
       - run: mkdir /distrib && cp webrtc-streamer*.tar.gz /distrib
       - persist_to_workspace:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -66,7 +66,7 @@ if (NOT EXISTS ${WEBRTCOBJS}/${CMAKE_STATIC_LIBRARY_PREFIX}webrtc${CMAKE_STATIC_
     else()
       message("install-sysroot.py succeeded ${SYSROOT_OUTPUT}")
     endif()
-  else(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
+  elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
     EXECUTE_PROCESS(WORKING_DIRECTORY ${WEBRTCROOT}/src 
                     COMMAND build/linux/sysroot_scripts/install-sysroot.py --arch=arm64
                     RESULT_VARIABLE SYSROOT_RESULT

diff --git a/Dockerfile.windows b/Dockerfile.windows
@@ -31,7 +31,7 @@ RUN git config --global core.autocrlf false \
        && set \
        && time /t \
        && mkdir c:\webrtc && cd c:\webrtc \
-       && fetch --nohooks webrtc \
+       && fetch webrtc \
        && time /t \
        && cd C:\webrtc-streamer \
        && cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/app -DCMAKE_C_COMPILER=clang-cl.exe -DCMAKE_CXX_COMPILER=clang-cl.exe -DCMAKE_MAKE_PROGRAM=ninja.bat . \