From dbb5204bb371a9ad290e30ce8771705eabb688f2 Mon Sep 17 00:00:00 2001 From: Joakim Hunskaar <joakim.borge.hunskar@gmail.com> Date: Wed, 26 Feb 2025 16:20:11 +0100 Subject: [PATCH] changed to c++20 --- dependencies/meson.build | 2 +- dependencies/subprojects/animationwindow/meson.build | 2 +- dependencies/subprojects/std_lib_facilities/meson.build | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies/meson.build b/dependencies/meson.build index 023cbe7..17d8011 100644 --- a/dependencies/meson.build +++ b/dependencies/meson.build @@ -1,7 +1,7 @@ project('testproject', 'cpp', version : '0.1', default_options : ['warning_level=0', - 'cpp_std=c++17', + 'cpp_std=c++20', 'c_std=c17', 'default_library=static']) diff --git a/dependencies/subprojects/animationwindow/meson.build b/dependencies/subprojects/animationwindow/meson.build index 68955c5..a6e6e12 100644 --- a/dependencies/subprojects/animationwindow/meson.build +++ b/dependencies/subprojects/animationwindow/meson.build @@ -1,4 +1,4 @@ -project('animationwindow', ['c', 'cpp'], version: '0.01', default_options: ['cpp_std=c++20', 'default_library=static', 'buildtype=debugoptimized']) +project('animationwindow', ['c', 'cpp'], version: '0.01', default_options: ['cpp_std=c++20', 'c_std=c17', 'default_library=static', 'buildtype=debugoptimized']) if host_machine.system() == 'windows' sdl2_dep = subproject('sdl2_windows').get_variable('sdl2_windows_dep') diff --git a/dependencies/subprojects/std_lib_facilities/meson.build b/dependencies/subprojects/std_lib_facilities/meson.build index 9448436..dfefbc9 100644 --- a/dependencies/subprojects/std_lib_facilities/meson.build +++ b/dependencies/subprojects/std_lib_facilities/meson.build @@ -1,4 +1,4 @@ -project('std_lib_facilities', ['c', 'cpp'], version: '0.01', default_options: ['cpp_std=c++17', 'default_library=static', 'buildtype=debugoptimized']) +project('std_lib_facilities', ['c', 'cpp'], version: '0.01', default_options: ['cpp_std=c++20', 'c_std=c17', 'default_library=static', 'buildtype=debugoptimized']) incdir = include_directories('.') install_subdir('include', install_dir: '.') -- GitLab