From 4c573da172ae800b0e18b060b85cc5ab86314078 Mon Sep 17 00:00:00 2001 From: Adrien GIVRY Date: Sat, 4 Apr 2026 16:25:07 -0400 Subject: [PATCH 1/2] Added .vscode config --- .vscode/launch.json | 21 ++++++++++ .vscode/tasks.json | 95 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 .vscode/launch.json create mode 100644 .vscode/tasks.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 000000000..37e8719b0 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,21 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Debug OvEditor (Debug)", + "type": "lldb", + "request": "launch", + "cwd": "${workspaceFolder}/Build/Debug", + "program": "${workspaceFolder}/Build/Debug/OvEditor", + "preLaunchTask": "Build (Debug x64)" + }, + { + "name": "Debug OvEditor (Release)", + "type": "lldb", + "request": "launch", + "cwd": "${workspaceFolder}/Build/Release", + "program": "${workspaceFolder}/Build/Release/OvEditor", + "preLaunchTask": "Build (Release x64)" + } + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 000000000..353468dc3 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,95 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "Generate", + "type": "shell", + "command": "./gen_proj.sh gmake", + "options": { + "cwd": "${workspaceFolder}" + }, + "group": "build", + "presentation": { + "reveal": "always", + "panel": "shared", + "clear": true + }, + "problemMatcher": [] + }, + { + "label": "Build (Debug x64)", + "type": "shell", + "command": "bear -- make -j$(nproc) config=debug_x64", + "options": { + "cwd": "${workspaceFolder}" + }, + "group": { + "kind": "build", + "isDefault": true + }, + "presentation": { + "reveal": "always", + "panel": "shared", + "clear": false + }, + "problemMatcher": { + "owner": "cpp", + "fileLocation": ["relative", "${workspaceFolder}"], + "pattern": { + "regexp": "^(.*):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)$", + "file": 1, + "line": 2, + "column": 3, + "severity": 4, + "message": 5 + } + }, + "dependsOn": [] + }, + { + "label": "Build (Release x64)", + "type": "shell", + "command": "bear -- make -j$(nproc) config=release_x64", + "options": { + "cwd": "${workspaceFolder}" + }, + "group": { + "kind": "build", + "isDefault": true + }, + "presentation": { + "reveal": "always", + "panel": "shared", + "clear": false + }, + "problemMatcher": { + "owner": "cpp", + "fileLocation": ["relative", "${workspaceFolder}"], + "pattern": { + "regexp": "^(.*):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)$", + "file": 1, + "line": 2, + "column": 3, + "severity": 4, + "message": 5 + } + }, + "dependsOn": [] + }, + { + "label": "Clean", + "type": "shell", + "command": "make clean", + "options": { + "cwd": "${workspaceFolder}" + }, + "group": "build", + "presentation": { + "reveal": "always", + "panel": "shared", + "clear": true + }, + "problemMatcher": [] + }, + ] +} From 0afa0f328a63c57ed9cf8b92c92c17dd6cd89d96 Mon Sep 17 00:00:00 2001 From: Adrien Givry Date: Mon, 13 Apr 2026 19:05:41 -0400 Subject: [PATCH 2/2] Update build commands to use --append option --- .vscode/tasks.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 353468dc3..15e890b2d 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -19,7 +19,7 @@ { "label": "Build (Debug x64)", "type": "shell", - "command": "bear -- make -j$(nproc) config=debug_x64", + "command": "bear --append -- make -j$(nproc) config=debug_x64", "options": { "cwd": "${workspaceFolder}" }, @@ -49,7 +49,7 @@ { "label": "Build (Release x64)", "type": "shell", - "command": "bear -- make -j$(nproc) config=release_x64", + "command": "bear --append -- make -j$(nproc) config=release_x64", "options": { "cwd": "${workspaceFolder}" },