mirror of https://github.com/xemu-project/xemu.git
meson: Specify c++17 std
This commit is contained in:
parent
4d2f382142
commit
ff4d682af6
|
@ -159,7 +159,7 @@ update_cxxflags() {
|
||||||
# options which some versions of GCC's C++ compiler complain about
|
# options which some versions of GCC's C++ compiler complain about
|
||||||
# because they only make sense for C programs.
|
# because they only make sense for C programs.
|
||||||
QEMU_CXXFLAGS="$QEMU_CXXFLAGS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS"
|
QEMU_CXXFLAGS="$QEMU_CXXFLAGS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS"
|
||||||
CONFIGURE_CXXFLAGS=$(echo "$CONFIGURE_CFLAGS" | sed s/-std=gnu11/-std=gnu++11/)
|
CONFIGURE_CXXFLAGS=$(echo "$CONFIGURE_CFLAGS" | sed s/-std=gnu11//)
|
||||||
for arg in $QEMU_CFLAGS; do
|
for arg in $QEMU_CFLAGS; do
|
||||||
case $arg in
|
case $arg in
|
||||||
-Wstrict-prototypes|-Wmissing-prototypes|-Wnested-externs|\
|
-Wstrict-prototypes|-Wmissing-prototypes|-Wnested-externs|\
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
project('qemu', ['c'], meson_version: '>=0.55.0',
|
project('qemu', ['c'], meson_version: '>=0.55.0',
|
||||||
default_options: ['warning_level=1', 'c_std=gnu11', 'cpp_std=gnu++11', 'b_colorout=auto'] +
|
default_options: ['warning_level=1', 'c_std=gnu11', 'cpp_std=c++17', 'b_colorout=auto'] +
|
||||||
(meson.version().version_compare('>=0.56.0') ? [ 'b_staticpic=false' ] : []),
|
(meson.version().version_compare('>=0.56.0') ? [ 'b_staticpic=false' ] : []),
|
||||||
version: run_command('head', meson.source_root() / 'VERSION').stdout().strip())
|
version: run_command('head', meson.source_root() / 'VERSION').stdout().strip())
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue