Skip to content

Commit ccbbd07

Browse files
authored
Disable atomics when msvc does not support c11atomics (#60)
1 parent 1576b65 commit ccbbd07

File tree

3 files changed

+54386
-30
lines changed

3 files changed

+54386
-30
lines changed

.github/workflows/build-plugin.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ jobs:
2323
- name: Build & run jsdec as rizin plugin
2424
run: bash .ci-scripts/ci-build-linux.sh "${{ github.event.pull_request.base.ref || github.ref_name }}"
2525

26-
windows-64:
27-
runs-on: windows-latest
28-
name: ${{ matrix.release }}
26+
windows-latest:
27+
runs-on: ${{ matrix.os }}
28+
name: ${{ matrix.os }}
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
release:
33-
- "windows-static"
34-
- "windows-shared64"
32+
os:
33+
- "windows-latest"
34+
- "windows-2019"
3535
steps:
3636
- uses: actions/checkout@v4
3737
- uses: actions/setup-python@v5

subprojects/packagefiles/libquickjs/meson.build

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -40,30 +40,30 @@ compiler_flags = [
4040
]
4141

4242
if cc.get_id() == 'msvc'
43-
compiler_flags += '-Wno-unsafe-buffer-usage'
44-
compiler_flags += '-Wno-sign-conversion'
45-
compiler_flags += '-Wno-nonportable-system-include-path'
46-
compiler_flags += '-Wno-implicit-int-conversion'
47-
compiler_flags += '-Wno-shorten-64-to-32'
48-
compiler_flags += '-Wno-reserved-macro-identifier'
49-
compiler_flags += '-Wno-reserved-identifier'
50-
compiler_flags += '-Wdeprecated-declarations'
51-
compiler_flags += '/experimental:c11atomics'
52-
compiler_flags += '/wd4018' # -Wno-sign-conversion
53-
compiler_flags += '/wd4061' # -Wno-implicit-fallthrough
54-
compiler_flags += '/wd4100' # -Wno-unused-parameter
55-
compiler_flags += '/wd4200' # -Wno-zero-length-array
56-
compiler_flags += '/wd4242' # -Wno-shorten-64-to-32
57-
compiler_flags += '/wd4244' # -Wno-shorten-64-to-32
58-
compiler_flags += '/wd4245' # -Wno-sign-compare
59-
compiler_flags += '/wd4267' # -Wno-shorten-64-to-32
60-
compiler_flags += '/wd4388' # -Wno-sign-compare
61-
compiler_flags += '/wd4389' # -Wno-sign-compare
62-
compiler_flags += '/wd4710' # Function not inlined
63-
compiler_flags += '/wd4711' # Function was inlined
64-
compiler_flags += '/wd4820' # Padding added after construct
65-
compiler_flags += '/wd4996' # -Wdeprecated-declarations
66-
compiler_flags += '/wd5045' # Compiler will insert Spectre mitigation for memory load if /Qspectre switch specified
43+
compiler_flags += '-Wno-unsafe-buffer-usage'
44+
compiler_flags += '-Wno-sign-conversion'
45+
compiler_flags += '-Wno-nonportable-system-include-path'
46+
compiler_flags += '-Wno-implicit-int-conversion'
47+
compiler_flags += '-Wno-shorten-64-to-32'
48+
compiler_flags += '-Wno-reserved-macro-identifier'
49+
compiler_flags += '-Wno-reserved-identifier'
50+
compiler_flags += '-Wdeprecated-declarations'
51+
compiler_flags += '/experimental:c11atomics'
52+
compiler_flags += '/wd4018' # -Wno-sign-conversion
53+
compiler_flags += '/wd4061' # -Wno-implicit-fallthrough
54+
compiler_flags += '/wd4100' # -Wno-unused-parameter
55+
compiler_flags += '/wd4200' # -Wno-zero-length-array
56+
compiler_flags += '/wd4242' # -Wno-shorten-64-to-32
57+
compiler_flags += '/wd4244' # -Wno-shorten-64-to-32
58+
compiler_flags += '/wd4245' # -Wno-sign-compare
59+
compiler_flags += '/wd4267' # -Wno-shorten-64-to-32
60+
compiler_flags += '/wd4388' # -Wno-sign-compare
61+
compiler_flags += '/wd4389' # -Wno-sign-compare
62+
compiler_flags += '/wd4710' # Function not inlined
63+
compiler_flags += '/wd4711' # Function was inlined
64+
compiler_flags += '/wd4820' # Padding added after construct
65+
compiler_flags += '/wd4996' # -Wdeprecated-declarations
66+
compiler_flags += '/wd5045' # Compiler will insert Spectre mitigation for memory load if /Qspectre switch specified
6767
endif
6868

6969
# required on linux, but ignored by windows

0 commit comments

Comments
 (0)