summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEmīls Piņķis <emils@mullvad.net>2018-07-05 11:49:42 +0100
committerEmīls Piņķis <emils@mullvad.net>2018-07-05 16:05:36 +0100
commita6d7439bf093e9daf254740e247341b64158ca31 (patch)
treed1255b9e50c3294ed289f34561a460711d61108f
parent081b4979cb8fe899186f49abf14e8a7d0594b626 (diff)
downloadmullvadvpn-a6d7439bf093e9daf254740e247341b64158ca31.tar.xz
mullvadvpn-a6d7439bf093e9daf254740e247341b64158ca31.zip
Update README to instruct people to source environment files
-rw-r--r--README.md15
1 files changed, 4 insertions, 11 deletions
diff --git a/README.md b/README.md
index 2d6a652c8d..e8b2a62fda 100644
--- a/README.md
+++ b/README.md
@@ -47,18 +47,7 @@ The host has to have the following installed:
- `bash` installed as well as a few base unix utilities, including `sed` and `tail`.
The environment coming with [Git for Windows] works fine.
-To build certain parts of the app which require OpenSSL, one has to set some
-[environment variables], as instructed by the `openssl-sys` crate. By default,
-one should use statically compiled OpenSSL libraries that should be checked out
-in the `dist-assets\binaries` submodule:
-```powershell
-$env::OPENSSL_STATIC=1
-$env:OPENSSL_LIB_DIR=$pwd.Path+".\dist-assets\binaries\windows\"
-$env:OPENSSL_INCLUDE_DIR=$pwd.Path+".\dist-assets\binaries\windows\include\"
-```
-
[Git for Windows]: https://git-scm.com/download/win
-[environment variables]: https://github.com/sfackler/rust-openssl/#manual-configuration
### Linux
@@ -81,6 +70,10 @@ homebrew:
## Building and running mullvad-daemon
+1. Firstly, one should source `env.sh` to set the default environment
+ variables. One can also source the variables on Powershell with `env.ps1`,
+ however most of our scripts require bash.
+
1. If you are on Windows, then you have to build the C++ libraries before compiling the daemon.
Run `build_winfw.sh` to build a C++ library that sets firewall rules on Windows.
```bash