Skip to content

Commit

Permalink
Fix Windows settings popup with mesa 3d openGL emulator (#1428)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
mlsmaycon authored Jan 2, 2024
1 parent 86908ee commit fd8bba6
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

```
Expand Down
1 change: 1 addition & 0 deletions client/installer.nsis
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions client/netbird.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<Shortcut Id="NetbirdStartMenuShortcut" Directory="StartMenuFolder" Name="NetBird" WorkingDirectory="NetbirdInstallDir" Icon="NetbirdIcon" />
</File>
<File ProcessorArchitecture="x64" Source=".\dist\netbird_windows_amd64\wintun.dll" />
<File ProcessorArchitecture="x64" Source=".\dist\netbird_windows_amd64\opengl32.dll" />

<ServiceInstall
Id="NetBirdService"
Expand Down

0 comments on commit fd8bba6

Please sign in to comment.