From fd8bba6aa306c90ce6456c0ea24f6e987d8e219b Mon Sep 17 00:00:00 2001 From: Maycon Santos Date: Tue, 2 Jan 2024 16:16:20 +0100 Subject: [PATCH] Fix Windows settings popup with mesa 3d openGL emulator (#1428) By copying the emulator driver next to our binary, our GUI setting popup works on remote desktop connections the dll is added as part of our sign pipelines workflow --- .github/workflows/release.yml | 2 +- CONTRIBUTING.md | 2 ++ client/installer.nsis | 1 + client/netbird.wxs | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e4875bf3901..41b00e88882 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ on: - 'client/ui/**' env: - SIGN_PIPE_VER: "v0.0.10" + SIGN_PIPE_VER: "v0.0.11" GORELEASER_VER: "v1.14.1" concurrency: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8fe1a5255a9..9e658b51b28 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -189,6 +189,8 @@ CGO_ENABLED=0 go build . > Windows clients have a Wireguard driver requirement. You can download the wintun driver from https://www.wintun.net/builds/wintun-0.14.1.zip, after decompressing, you can copy the file `windtun\bin\ARCH\wintun.dll` to the same path as your binary file or to `C:\Windows\System32\wintun.dll`. +> To test the client GUI application on Windows machines with RDP or vituralized environments (e.g. virtualbox or cloud), you need to download and extract the opengl32.dll from https://fdossena.com/?p=mesa/index.frag next to the built application. + To start NetBird the client in the foreground: ``` diff --git a/client/installer.nsis b/client/installer.nsis index fbffa326d88..af942a868e0 100644 --- a/client/installer.nsis +++ b/client/installer.nsis @@ -193,6 +193,7 @@ Sleep 3000 Delete "$INSTDIR\${UI_APP_EXE}" Delete "$INSTDIR\${MAIN_APP_EXE}" Delete "$INSTDIR\wintun.dll" +Delete "$INSTDIR\opengl32.dll" RmDir /r "$INSTDIR" SetShellVarContext all diff --git a/client/netbird.wxs b/client/netbird.wxs index f9b2449bac4..0e2be7b3caa 100644 --- a/client/netbird.wxs +++ b/client/netbird.wxs @@ -20,6 +20,7 @@ +