Skip to content

change to c++23 and added print in featuredemo #17

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions configuration/.vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"_UNICODE"
],
"cStandard": "c17",
"cppStandard": "c++20",
"cppStandard": "c++23",
"compilerPath": "C:\\TDT4102-mingw64\\bin\\gcc",
"compileCommands": "${workspaceFolder}/build/compile_commands.json",
"intelliSenseMode": "windows-gcc-x64"
Expand All @@ -32,7 +32,7 @@
"_UNICODE"
],
"cStandard": "c17",
"cppStandard": "c++20",
"cppStandard": "c++23",
"compileCommands": "build/compile_commands.json",
"intelliSenseMode": "macos-clang-x64"
},
Expand All @@ -47,7 +47,7 @@
"_UNICODE"
],
"cStandard": "c17",
"cppStandard": "c++20",
"cppStandard": "c++23",
"compileCommands": "build/compile_commands.json",
"intelliSenseMode": "linux-gcc-x64"
}
Expand Down
2 changes: 1 addition & 1 deletion dependencies/meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project('testproject', 'cpp',
version : '0.1',
default_options : ['warning_level=0',
'cpp_std=c++20',
'cpp_std=c++23',
'c_std=c17',
'default_library=static'])

Expand Down
2 changes: 1 addition & 1 deletion dependencies/subprojects/animationwindow/meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
project('animationwindow', ['c', 'cpp'], version: '0.01', default_options: ['cpp_std=c++20', 'c_std=c17', 'default_library=static', 'buildtype=debugoptimized'])
project('animationwindow', ['c', 'cpp'], version: '0.01', default_options: ['cpp_std=c++23', 'c_std=c17', 'default_library=static', 'buildtype=debugoptimized'])

if host_machine.system() == 'windows'
sdl2_dep = subproject('sdl2_windows').get_variable('sdl2_windows_dep')
Expand Down
2 changes: 1 addition & 1 deletion dependencies/subprojects/std_lib_facilities/meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
project('std_lib_facilities', ['c', 'cpp'], version: '0.01', default_options: ['cpp_std=c++20', 'c_std=c17', 'default_library=static', 'buildtype=debugoptimized'])
project('std_lib_facilities', ['c', 'cpp'], version: '0.01', default_options: ['cpp_std=c++23', 'c_std=c17', 'default_library=static', 'buildtype=debugoptimized'])

incdir = include_directories('.')
install_subdir('include', install_dir: '.')
Expand Down
4 changes: 3 additions & 1 deletion dependencies/testproject_featuredemo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <iostream>
#include <random>
#include <map>
#include <print>

#include "widgets/Button.h"
#include "widgets/TextInput.h"
Expand Down Expand Up @@ -215,6 +216,7 @@ int main(int argc, char* argv[]) {
}
window.next_frame();
}

// new in c++23
std::println("hello from println");
return 0;
}