From 176365b4a433ca24f738636af23ea585f9a2bae5 Mon Sep 17 00:00:00 2001 From: Macocian Alexandru Victor Date: Wed, 11 Feb 2026 04:37:30 -0800 Subject: [PATCH] Build improvements (#1422) Co-authored-by: Alexandru Macocian --- .vscode/launch.json | 20 ++++++++----------- .vscode/tasks.json | 12 +++++++++++ Daybreak.Linux/Properties/launchSettings.json | 12 +++++++++++ .../Properties/launchSettings.json | 7 +++++++ Scripts/RunLinux.ps1 | 3 +-- Scripts/RunWindows.ps1 | 4 ++++ 6 files changed, 44 insertions(+), 14 deletions(-) create mode 100644 Daybreak.Linux/Properties/launchSettings.json create mode 100644 Daybreak.Windows/Properties/launchSettings.json create mode 100644 Scripts/RunWindows.ps1 diff --git a/.vscode/launch.json b/.vscode/launch.json index fbfbf143..20c18f27 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -3,19 +3,15 @@ "configurations": [ { "name": "Debug Daybreak.Linux", - "type": "coreclr", + "type": "dotnet", "request": "launch", - "preLaunchTask": "build-linux", - "program": "${workspaceFolder}/Daybreak.Linux/bin/Debug/net10.0/linux-x64/Daybreak.dll", - "args": [], - "cwd": "${workspaceFolder}/Daybreak.Linux/bin/Debug/net10.0/linux-x64", - "env": { - "GDK_BACKEND": "x11", - "WEBKIT_DISABLE_DMABUF_RENDERER": "1", - "WEBKIT_DISABLE_COMPOSITING_MODE": "1" - }, - "console": "integratedTerminal", - "stopAtEntry": false + "projectPath": "${workspaceFolder}/Daybreak.Linux/Daybreak.Linux.csproj" + }, + { + "name": "Debug Daybreak.Windows", + "type": "dotnet", + "request": "launch", + "projectPath": "${workspaceFolder}/Daybreak.Windows/Daybreak.Windows.csproj" } ] } diff --git a/.vscode/tasks.json b/.vscode/tasks.json index e6a003dc..71a5800b 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -12,6 +12,18 @@ "/consoleloggerparameters:NoSummary" ], "problemMatcher": "$msCompile" + }, + { + "label": "build-windows", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/Daybreak.Windows/Daybreak.Windows.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" } ] } diff --git a/Daybreak.Linux/Properties/launchSettings.json b/Daybreak.Linux/Properties/launchSettings.json new file mode 100644 index 00000000..22d956e3 --- /dev/null +++ b/Daybreak.Linux/Properties/launchSettings.json @@ -0,0 +1,12 @@ +{ + "profiles": { + "Daybreak.Linux": { + "commandName": "Project", + "environmentVariables": { + "GDK_BACKEND": "x11", + "WEBKIT_DISABLE_DMABUF_RENDERER": "1", + "WEBKIT_DISABLE_COMPOSITING_MODE": "1" + } + } + } +} diff --git a/Daybreak.Windows/Properties/launchSettings.json b/Daybreak.Windows/Properties/launchSettings.json new file mode 100644 index 00000000..66de993c --- /dev/null +++ b/Daybreak.Windows/Properties/launchSettings.json @@ -0,0 +1,7 @@ +{ + "profiles": { + "Daybreak.Windows": { + "commandName": "Project" + } + } +} diff --git a/Scripts/RunLinux.ps1 b/Scripts/RunLinux.ps1 index ba2a13b9..ce2d71d1 100644 --- a/Scripts/RunLinux.ps1 +++ b/Scripts/RunLinux.ps1 @@ -10,5 +10,4 @@ if (-not $env:WEBKIT_DISABLE_DMABUF_RENDERER) { $env:WEBKIT_DISABLE_DMABUF_RENDE # Disable GPU compositing (blank windows on some drivers) if (-not $env:WEBKIT_DISABLE_COMPOSITING_MODE) { $env:WEBKIT_DISABLE_COMPOSITING_MODE = "1" } -dotnet run --project Daybreak.Linux - +dotnet run --project Daybreak.Linux \ No newline at end of file diff --git a/Scripts/RunWindows.ps1 b/Scripts/RunWindows.ps1 new file mode 100644 index 00000000..20ab7564 --- /dev/null +++ b/Scripts/RunWindows.ps1 @@ -0,0 +1,4 @@ +$ErrorActionPreference = "Stop" +$RepoRoot = Resolve-Path "$PSScriptRoot/.." + +dotnet run --project Daybreak.Windows \ No newline at end of file