Skip to content

Commit

Permalink
Use new section for c/cpp args and link_args (#1878)
Browse files Browse the repository at this point in the history
Using lang_args and lang_links_args in the [properties] section has been deprecated in Meson 0.56.
[built-in options] section should be used instead.
  • Loading branch information
Kron4ek committed Jan 2, 2021
1 parent f39472a commit 77af102
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion build-win32.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ cpp = 'i686-w64-mingw32-g++'
ar = 'i686-w64-mingw32-ar'
strip = 'i686-w64-mingw32-strip'

[properties]
[built-in options]
c_args=['-msse', '-msse2']
cpp_args=['-msse', '-msse2']
c_link_args = ['-static', '-static-libgcc']
cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++']

[properties]
needs_exe_wrapper = true

[host_machine]
Expand Down
4 changes: 3 additions & 1 deletion build-win64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ cpp = 'x86_64-w64-mingw32-g++'
ar = 'x86_64-w64-mingw32-ar'
strip = 'x86_64-w64-mingw32-strip'

[properties]
[built-in options]
c_link_args = ['-static', '-static-libgcc']
cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++']

[properties]
needs_exe_wrapper = true

[host_machine]
Expand Down

1 comment on commit 77af102

@GloriousEggroll
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this breaks compiling in proton, as the proton build environment does not have meson 0.56

Please sign in to comment.