Merge branch 'main' of https://git.kerner.dev/yeet/TSE-RTS into DICOM_Viewer

This commit is contained in:
2026-03-26 19:07:00 +01:00
3 changed files with 104 additions and 15 deletions

30
.vscode/launch.json vendored
View File

@@ -5,23 +5,45 @@
"version": "0.2.0", "version": "0.2.0",
"configurations": [ "configurations": [
{ {
"name": "Debug Linux", "name": "Debug Linux GLFW",
"type": "cppdbg", "type": "cppdbg",
"request": "launch", "request": "launch",
"MIMode": "gdb", "MIMode": "gdb",
"program": "${workspaceFolder}/bin/TSE-RTS", "program": "${workspaceFolder}/bin/TSE-RTS",
"preLaunchTask": "build_debug_linux", "preLaunchTask": "build_debug_GLFW_linux",
"args": [], "args": [],
"stopAtEntry": false, "stopAtEntry": false,
"cwd": "${workspaceFolder}/bin" "cwd": "${workspaceFolder}/bin"
}, },
{ {
"name": "Debug Windows", "name": "Debug Linux SDL3",
"type": "cppdbg",
"request": "launch",
"MIMode": "gdb",
"program": "${workspaceFolder}/bin/TSE-RTS",
"preLaunchTask": "build_debug_SDL3_linux",
"args": [],
"stopAtEntry": false,
"cwd": "${workspaceFolder}/bin"
},
{
"name": "Debug Windows GLFW",
"type": "cppvsdbg", "type": "cppvsdbg",
"request": "launch", "request": "launch",
//"MIMode": "gdb", //"MIMode": "gdb",
"program": "${workspaceFolder}/bin/TSE-RTS", "program": "${workspaceFolder}/bin/TSE-RTS",
"preLaunchTask": "build_debug_linux", "preLaunchTask": "build_debug_GLFW_linux",
"args": [],
"stopAtEntry": false,
"cwd": "${workspaceFolder}/bin"
},
{
"name": "Debug Windows SDL3",
"type": "cppvsdbg",
"request": "launch",
//"MIMode": "gdb",
"program": "${workspaceFolder}/bin/TSE-RTS",
"preLaunchTask": "build_debug_SDL3_linux",
"args": [], "args": [],
"stopAtEntry": false, "stopAtEntry": false,
"cwd": "${workspaceFolder}/bin" "cwd": "${workspaceFolder}/bin"

87
.vscode/tasks.json vendored
View File

@@ -20,7 +20,7 @@
"problemMatcher": [] "problemMatcher": []
}, },
{ {
"label": "build_debug_linux_cmake", "label": "build_debug_SDL3_linux_cmake",
"type": "shell", "type": "shell",
"command": "cmake", "command": "cmake",
"args": [ "args": [
@@ -28,7 +28,6 @@
"${workspaceFolder}/.", "${workspaceFolder}/.",
"-B", "-B",
"${workspaceFolder}/./build", "${workspaceFolder}/./build",
"-DDEBUG=ON",
"-G Ninja", "-G Ninja",
"-DCMAKE_C_COMPILER=clang", "-DCMAKE_C_COMPILER=clang",
"-DCMAKE_CXX_COMPILER=clang++", "-DCMAKE_CXX_COMPILER=clang++",
@@ -41,9 +40,30 @@
"isDefault": true "isDefault": true
}, },
"problemMatcher": [] "problemMatcher": []
}, },{
{ "label": "build_debug_GLFW_linux_cmake",
"label": "build_release_linux_cmake", "type": "shell",
"command": "cmake",
"args": [
"-S",
"${workspaceFolder}/.",
"-B",
"${workspaceFolder}/./build",
"-G Ninja",
"-DCMAKE_C_COMPILER=clang",
"-DCMAKE_CXX_COMPILER=clang++",
"-DCMAKE_LINKER=lld-link",
"-DCMAKE_BUILD_TYPE=Debug",
"-DUSE_GLFW=ON"
],
"group": {
"kind": "build",
"isDefault": true
},
"problemMatcher": []
},
{
"label": "build_release_SDL3_linux_cmake",
"type": "shell", "type": "shell",
"command": "cmake", "command": "cmake",
"args": [ "args": [
@@ -51,7 +71,6 @@
"${workspaceFolder}/.", "${workspaceFolder}/.",
"-B", "-B",
"${workspaceFolder}/./build", "${workspaceFolder}/./build",
"-DDEBUG=OFF",
"-G Ninja", "-G Ninja",
"-DCMAKE_C_COMPILER=clang", "-DCMAKE_C_COMPILER=clang",
"-DCMAKE_CXX_COMPILER=clang++", "-DCMAKE_CXX_COMPILER=clang++",
@@ -66,9 +85,31 @@
"problemMatcher": [] "problemMatcher": []
}, },
{ {
"label": "build_debug_linux", "label": "build_release_GLFW_linux_cmake",
"type": "shell",
"command": "cmake",
"args": [
"-S",
"${workspaceFolder}/.",
"-B",
"${workspaceFolder}/./build",
"-G Ninja",
"-DCMAKE_C_COMPILER=clang",
"-DCMAKE_CXX_COMPILER=clang++",
"-DCMAKE_LINKER=lld-link",
"-DCMAKE_BUILD_TYPE=Release",
"-DUSE_GLFW=ON"
],
"group": {
"kind": "build",
"isDefault": true
},
"problemMatcher": []
},
{
"label": "build_debug_SDL3_linux",
"dependsOn": [ "dependsOn": [
"build_debug_linux_cmake", "build_release_SDL3_linux_cmake",
"make_linux" "make_linux"
], ],
"dependsOrder": "sequence", "dependsOrder": "sequence",
@@ -79,9 +120,35 @@
} }
}, },
{ {
"label": "build_release_linux", "label": "build_release_SDL3_linux",
"dependsOn": [ "dependsOn": [
"build_release_linux_cmake", "build_release_SDL3_linux_cmake",
"make_linux"
],
"dependsOrder": "sequence",
"problemMatcher": [],
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "build_debug_GLFW_linux",
"dependsOn": [
"build_release_GLFW_linux_cmake",
"make_linux"
],
"dependsOrder": "sequence",
"problemMatcher": [],
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "build_release_GLFW_linux",
"dependsOn": [
"build_release_GLFW_linux_cmake",
"make_linux" "make_linux"
], ],
"dependsOrder": "sequence", "dependsOrder": "sequence",

2
TSE

Submodule TSE updated: 51a6ea1328...8c0152c3b4