From cfa85970387c6e14ed2b652f06740b9bc3dfe510 Mon Sep 17 00:00:00 2001 From: "Il'ya (Marshal)" Date: Sat, 29 Jan 2022 14:28:08 +0100 Subject: [PATCH 1/2] fix build for win x32 --- .github/workflows/build_windows_wheels.yml | 7 ++++--- CMakeLists.txt | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_windows_wheels.yml b/.github/workflows/build_windows_wheels.yml index 728b7e0..5b79421 100644 --- a/.github/workflows/build_windows_wheels.yml +++ b/.github/workflows/build_windows_wheels.yml @@ -4,6 +4,7 @@ on: branches: - main - pypi-dev + - win-32 paths: - '.github/workflows/build_windows_wheels.yml' - 'python-webrtc/cpp/**' @@ -19,8 +20,8 @@ jobs: strategy: matrix: arch: [ -# "x32", - "x64", + "x32", +# "x64", ] env: @@ -52,7 +53,7 @@ jobs: if: matrix.arch == 'x32' working-directory: "C:/src" env: - TARGET_ARCH: ia32 + TARGET_ARCH: x86 CIBW_BEFORE_BUILD: call vcvars32.bat CIBW_ARCHS: x86 CIBW_PROJECT_REQUIRES_PYTHON: ">=3.7" diff --git a/CMakeLists.txt b/CMakeLists.txt index 16f637f..0b31edc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -166,9 +166,9 @@ else() rtc_build_tools=false ) - if ("$ENV{TARGET_ARCH}" STREQUAL "ia32") + if ("$ENV{TARGET_ARCH}" STREQUAL "x86") list(APPEND GN_GEN_ARGS - target_arch=ia32 + target_cpu=x86 ) endif() endif() From d5e182df1fb8a1b8d895f4dd64ab4739fdd0e767 Mon Sep 17 00:00:00 2001 From: "Il'ya (Marshal)" Date: Thu, 3 Feb 2022 11:41:50 +0100 Subject: [PATCH 2/2] fix depot tools version for windows --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index cf5dfc6..e11f6a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,6 +27,10 @@ else() set(DEPOT_GIT_TAG 9b5dd7ab8a98140a1b73b9dea29245605137cd09) # glibc 2.18, supports python 3 < 3.8 endif() +if (WIN32) + set(DEPOT_GIT_TAG 2fddb95698211db1373ebe2b16091a54eac51c9c) +endif() + ExternalProject_Add( project_depot_tools