diff options
| author | Odd Stranne <odd@mullvad.net> | 2019-04-15 18:59:51 +0200 |
|---|---|---|
| committer | Odd Stranne <odd@mullvad.net> | 2019-04-17 15:14:10 +0200 |
| commit | d8cce2dfeeca1959e5c18d62770839bfd93c8498 (patch) | |
| tree | 0a4747746a83c868b009458d88d51f1cef3b9e29 | |
| parent | b521696961251036b506dc8e5748d0d055e2da08 (diff) | |
| download | mullvadvpn-d8cce2dfeeca1959e5c18d62770839bfd93c8498.tar.xz mullvadvpn-d8cce2dfeeca1959e5c18d62770839bfd93c8498.zip | |
Update build scripts
| -rwxr-xr-x | build_windows_modules.sh | 6 | ||||
| -rwxr-xr-x | gui/electron-builder.yml | 2 | ||||
| -rw-r--r-- | talpid-core/build.rs | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/build_windows_modules.sh b/build_windows_modules.sh index 9bfb8c70b7..d533973f6c 100755 --- a/build_windows_modules.sh +++ b/build_windows_modules.sh @@ -163,15 +163,15 @@ function main { local winfw_root_path=${CPP_ROOT_PATH:-"./windows/winfw"} local windns_root_path=${CPP_ROOT_PATH:-"./windows/windns"} - local winroute_root_path=${CPP_ROOT_PATH:-"./windows/winroute"} + local winnet_root_path=${CPP_ROOT_PATH:-"./windows/winnet"} build_solution "$winfw_root_path" "winfw.sln" build_solution "$windns_root_path" "windns.sln" - build_solution "$winroute_root_path" "winroute.sln" + build_solution "$winnet_root_path" "winnet.sln" copy_outputs $winfw_root_path "winfw.dll" copy_outputs $windns_root_path "windns.dll" - copy_outputs $winroute_root_path "winroute.dll" + copy_outputs $winnet_root_path "winnet.dll" build_nsis_plugins } diff --git a/gui/electron-builder.yml b/gui/electron-builder.yml index 44f197a0c4..c3010e6764 100755 --- a/gui/electron-builder.yml +++ b/gui/electron-builder.yml @@ -90,7 +90,7 @@ win: to: . - from: ../windows/windns/bin/x64-Release/windns.dll to: . - - from: ../windows/winroute/bin/x64-Release/winroute.dll + - from: ../windows/winnet/bin/x64-Release/winnet.dll to: . - from: ../dist-assets/binaries/windows/openvpn.exe to: . diff --git a/talpid-core/build.rs b/talpid-core/build.rs index a733cfccbc..4741a440d0 100644 --- a/talpid-core/build.rs +++ b/talpid-core/build.rs @@ -7,7 +7,7 @@ mod win { pub static WINFW_BUILD_DIR: &'static str = "..\\windows\\winfw\\bin"; pub static WINDNS_BUILD_DIR: &'static str = "..\\windows\\windns\\bin"; - pub static WINROUTE_BUILD_DIR: &'static str = "..\\windows\\winroute\\bin"; + pub static WINNET_BUILD_DIR: &'static str = "..\\windows\\winnet\\bin"; pub fn default_windows_build_artifact_dir(build_dir: &str) -> PathBuf { manifest_dir().join(build_dir).join(&target_platform_dir()) @@ -49,10 +49,10 @@ fn main() { const WINFW_DIR_VAR: &str = "WINFW_LIB_DIR"; const WINDNS_DIR_VAR: &str = "WINDNS_LIB_DIR"; - const WINROUTE_DIR_VAR: &str = "WINROUTE_LIB_DIR"; + const WINNET_DIR_VAR: &str = "WINNET_LIB_DIR"; declare_library(WINFW_DIR_VAR, WINFW_BUILD_DIR, "winfw"); declare_library(WINDNS_DIR_VAR, WINDNS_BUILD_DIR, "windns"); - declare_library(WINROUTE_DIR_VAR, WINROUTE_BUILD_DIR, "winroute"); + declare_library(WINNET_DIR_VAR, WINNET_BUILD_DIR, "winnet"); } #[cfg(not(windows))] |