Skip to content
This repository was archived by the owner on Oct 25, 2024. It is now read-only.

Commit 3c12194

Browse files
authored
Use ffmpeg's stdatomic fallback on Windows. (#682)
<stdatomic.h> shipped with VS2022 is not yet supported when compiling as C.
1 parent e629093 commit 3c12194

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

scripts/build-win.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
'enable_libaom=true',
3333
'rtc_build_examples=false',
3434
'treat_warnings_as_errors=false',
35+
# <stdatomic.h> is not yet supported when compiling as C.
36+
'ffmpeg_use_unsafe_atomics=true',
3537
]
3638

3739

@@ -56,10 +58,6 @@ def gngen(arch, ssl_root, msdk_root, quic_root, scheme, tests, runtime):
5658
gn_args.append('owt_use_openssl=true')
5759
gn_args.append('owt_openssl_header_root="%s"' % (ssl_root + r'\include'))
5860
gn_args.append('owt_openssl_lib_root="%s"' % (ssl_root + r'\lib'))
59-
if runtime == 'shared':
60-
gn_args.append('owt_msvc_build_md=true')
61-
else:
62-
gn_args.append('owt_msvc_build_md=false')
6361
if msdk_root:
6462
if arch == 'x86':
6563
msdk_lib = msdk_root + r'\lib\win32'
@@ -185,7 +183,7 @@ def main():
185183
parser.add_argument('--arch', default='x86', dest='arch', choices=('x86', 'x64', 'arm64'),
186184
help='Target architecture. Supported value: x86, x64')
187185
parser.add_argument('--runtime', default='shared', choices=('static', 'shared'),
188-
help='VC runtime linkage. Supported value: shared, static')
186+
help='VC runtime linkage. Currently not supported.')
189187
parser.add_argument('--ssl_root', help='Path for OpenSSL.')
190188
parser.add_argument('--msdk_root', help='Path for MSDK.')
191189
parser.add_argument('--quic_root', help='Path to QUIC library')

0 commit comments

Comments
 (0)