summaryrefslogtreecommitdiffhomepage
path: root/build-windows-modules.sh
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2022-10-11 17:51:17 +0200
committerDavid Lönnhager <david.l@mullvad.net>2022-10-12 12:58:43 +0200
commit8b4adca18efe4c5f98102117961aee6265d776b6 (patch)
tree054311fb9f8c01892f20cc8cd3c9abdfd60e933d /build-windows-modules.sh
parent1136019bf84c36d7798de074a6eeb7e1cc470b7b (diff)
downloadmullvadvpn-8b4adca18efe4c5f98102117961aee6265d776b6.tar.xz
mullvadvpn-8b4adca18efe4c5f98102117961aee6265d776b6.zip
Remove pointless CPP_ROOT_PATH variable
Diffstat (limited to 'build-windows-modules.sh')
-rwxr-xr-xbuild-windows-modules.sh18
1 files changed, 7 insertions, 11 deletions
diff --git a/build-windows-modules.sh b/build-windows-modules.sh
index 2d1272d77a..41433da069 100755
--- a/build-windows-modules.sh
+++ b/build-windows-modules.sh
@@ -76,29 +76,25 @@ function get_solution_output_path {
}
function build_nsis_plugins {
- local nsis_root_path=${CPP_ROOT_PATH:-"./windows/nsis-plugins"}
+ local nsis_root_path="./windows/nsis-plugins"
clean_solution "$nsis_root_path"
build_solution_config "$nsis_root_path/nsis-plugins.sln" "Release" "x86"
}
function clean_libraries {
- clean_solution "${CPP_ROOT_PATH:-"./windows/libshared"}"
- clean_solution "${CPP_ROOT_PATH:-"./windows/windows-libraries"}"
- clean_solution "${CPP_ROOT_PATH:-"./windows/libwfp"}"
+ clean_solution "./windows/libshared"
+ clean_solution "./windows/windows-libraries"
+ clean_solution "./windows/libwfp"
}
function main {
- local winfw_root_path=${CPP_ROOT_PATH:-"./windows/winfw"}
- local winnet_root_path=${CPP_ROOT_PATH:-"./windows/winnet"}
-
clean_libraries
- build_solution "$winfw_root_path" "winfw.sln"
- build_solution "$winnet_root_path" "winnet.sln"
+ build_solution "./windows/winfw" "winfw.sln"
+ build_solution "./windows/winnet" "winnet.sln"
- local driverlogic_root_path=${CPP_ROOT_PATH:-"./windows/driverlogic"}
- build_solution "$driverlogic_root_path" "driverlogic.sln"
+ build_solution "./windows/driverlogic" "driverlogic.sln"
build_nsis_plugins
}