summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2024-11-14 13:47:37 +0100
committerDavid Lönnhager <david.l@mullvad.net>2024-11-20 08:49:17 +0100
commitb938ec724d2865e82d5a1a34a46d3fd4629a01b8 (patch)
treec2d2b1696e5ae03072ebaab627a06f4acbd2ca6c
parentc51f2ae757db6b36f4467bb7f8a8d742e8ab8cc3 (diff)
downloadmullvadvpn-b938ec724d2865e82d5a1a34a46d3fd4629a01b8.tar.xz
mullvadvpn-b938ec724d2865e82d5a1a34a46d3fd4629a01b8.zip
Update build instructions for vcvars
-rw-r--r--BuildInstructions.md10
1 files changed, 8 insertions, 2 deletions
diff --git a/BuildInstructions.md b/BuildInstructions.md
index 48da8cdfbf..6ef33d5005 100644
--- a/BuildInstructions.md
+++ b/BuildInstructions.md
@@ -93,6 +93,9 @@ The host has to have the following installed:
- Windows 10 (or Windows 11) SDK.
+- `bash` installed as well as a few base unix utilities, including `sed` and `tail`.
+ You are recommended to use [Git for Windows].
+
- `msbuild.exe` available in `%PATH%`. If you installed Visual Studio Community edition, the
binary can be found under:
@@ -102,8 +105,8 @@ The host has to have the following installed:
Where `<arch>` refers to the host architecture, either `amd64` or `arm64`.
-- `bash` installed as well as a few base unix utilities, including `sed` and `tail`.
- You are recommended to use [Git for Windows].
+ The environment can also be set up in bash by sourcing `vcvars.sh`: `. ./scripts/vcvars.sh`. Note
+ that that script assumes that you're running VS 2022 Community.
- The `x86` target is required for building some NSIS plugins:
@@ -143,6 +146,9 @@ In addition to the above requirements:
`INCLUDE` also needs to include the correct headers for clang. This can be found by running
`vcvarsall.bat arm64` and typing `set INCLUDE`.
+ The environment can also be set up in bash by sourcing `vcvars.sh`: `. ./scripts/vcvars.sh`. Note
+ that that script assumes that you're running VS 2022 Community.
+
- `grpc-tools` currently doesn't include ARM builds. The x64 binaries must be installed to build
the Electron app: