Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable atomics when msvc does not support c11atomics #60

Merged
merged 1 commit into from
Oct 21, 2024
Merged

Disable atomics when msvc does not support c11atomics #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build-plugin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ jobs:
- name: Build & run jsdec as rizin plugin
run: bash .ci-scripts/ci-build-linux.sh "${{ github.event.pull_request.base.ref || github.ref_name }}"

windows-64:
runs-on: windows-latest
name: ${{ matrix.release }}
windows-latest:
runs-on: ${{ matrix.os }}
name: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
release:
- "windows-static"
- "windows-shared64"
os:
- "windows-latest"
- "windows-2019"
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
Expand Down
48 changes: 24 additions & 24 deletions subprojects/packagefiles/libquickjs/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,30 +40,30 @@ compiler_flags = [
]

if cc.get_id() == 'msvc'
compiler_flags += '-Wno-unsafe-buffer-usage'
compiler_flags += '-Wno-sign-conversion'
compiler_flags += '-Wno-nonportable-system-include-path'
compiler_flags += '-Wno-implicit-int-conversion'
compiler_flags += '-Wno-shorten-64-to-32'
compiler_flags += '-Wno-reserved-macro-identifier'
compiler_flags += '-Wno-reserved-identifier'
compiler_flags += '-Wdeprecated-declarations'
compiler_flags += '/experimental:c11atomics'
compiler_flags += '/wd4018' # -Wno-sign-conversion
compiler_flags += '/wd4061' # -Wno-implicit-fallthrough
compiler_flags += '/wd4100' # -Wno-unused-parameter
compiler_flags += '/wd4200' # -Wno-zero-length-array
compiler_flags += '/wd4242' # -Wno-shorten-64-to-32
compiler_flags += '/wd4244' # -Wno-shorten-64-to-32
compiler_flags += '/wd4245' # -Wno-sign-compare
compiler_flags += '/wd4267' # -Wno-shorten-64-to-32
compiler_flags += '/wd4388' # -Wno-sign-compare
compiler_flags += '/wd4389' # -Wno-sign-compare
compiler_flags += '/wd4710' # Function not inlined
compiler_flags += '/wd4711' # Function was inlined
compiler_flags += '/wd4820' # Padding added after construct
compiler_flags += '/wd4996' # -Wdeprecated-declarations
compiler_flags += '/wd5045' # Compiler will insert Spectre mitigation for memory load if /Qspectre switch specified
compiler_flags += '-Wno-unsafe-buffer-usage'
compiler_flags += '-Wno-sign-conversion'
compiler_flags += '-Wno-nonportable-system-include-path'
compiler_flags += '-Wno-implicit-int-conversion'
compiler_flags += '-Wno-shorten-64-to-32'
compiler_flags += '-Wno-reserved-macro-identifier'
compiler_flags += '-Wno-reserved-identifier'
compiler_flags += '-Wdeprecated-declarations'
compiler_flags += '/experimental:c11atomics'
compiler_flags += '/wd4018' # -Wno-sign-conversion
compiler_flags += '/wd4061' # -Wno-implicit-fallthrough
compiler_flags += '/wd4100' # -Wno-unused-parameter
compiler_flags += '/wd4200' # -Wno-zero-length-array
compiler_flags += '/wd4242' # -Wno-shorten-64-to-32
compiler_flags += '/wd4244' # -Wno-shorten-64-to-32
compiler_flags += '/wd4245' # -Wno-sign-compare
compiler_flags += '/wd4267' # -Wno-shorten-64-to-32
compiler_flags += '/wd4388' # -Wno-sign-compare
compiler_flags += '/wd4389' # -Wno-sign-compare
compiler_flags += '/wd4710' # Function not inlined
compiler_flags += '/wd4711' # Function was inlined
compiler_flags += '/wd4820' # Padding added after construct
compiler_flags += '/wd4996' # -Wdeprecated-declarations
compiler_flags += '/wd5045' # Compiler will insert Spectre mitigation for memory load if /Qspectre switch specified
endif

# required on linux, but ignored by windows
Expand Down
Loading