nessi/NexaVPN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: migrate Windows target from x86 to x64 architecture

Browse Source 
Update all Windows build configurations, scripts, and documentation from i686-pc-windows-msvc (x86) to x86_64-pc-windows-msvc (x64). Update npm scripts, build-tunnel-helper.sh target validation, bundled helper paths, and tunnel manager strategy references. Add XWIN_ARCH=x86_64 environment variable to Linux cross-build command and --xwin-arch flag to cargo xwin invocation.
This commit is contained in:
Sascha Nesterovic
2026-03-17 19:13:56 +01:00
parent 8d8a3a7859
commit 991df88d58
6 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
desktop-client/scripts/build-tunnel-helper.sh
View File

@@ -13,8 +13,8 @@ if [ -z "${TARGET}" ]; then
fi
case "${TARGET}" in
i686-pc-windows-msvc)
OUTPUT_DIR="${BUNDLED_DIR}/windows-x86"
x86_64-pc-windows-msvc)
OUTPUT_DIR="${BUNDLED_DIR}/windows-x64"
OUTPUT_NAME="nexavpn-tunnel-helper.exe"
;;
aarch64-apple-darwin)
@@ -27,7 +27,7 @@ case "${TARGET}" in
;;
esac
if [ "${TARGET}" = "i686-pc-windows-msvc" ]; then
if [ "${TARGET}" = "x86_64-pc-windows-msvc" ]; then
case "${HOST_OS}" in
MINGW64_NT*|MSYS_NT*|CYGWIN_NT*)
;;
@@ -40,10 +40,10 @@ if [ "${TARGET}" = "i686-pc-windows-msvc" ]; then
fi
;;
*)
echo "Windows x86 helper builds are supported on Windows or on Linux with cargo-xwin."
echo "Windows x64 helper builds are supported on Windows or on Linux with cargo-xwin."
echo "Current host: ${HOST_OS}"
echo "Install the target with:"
echo " rustup target add i686-pc-windows-msvc"
echo " rustup target add x86_64-pc-windows-msvc"
exit 1
;;
esac
@@ -70,8 +70,8 @@ if ! rustup target list --installed | grep -qx "${TARGET}"; then
fi
mkdir -p "${OUTPUT_DIR}"
if [ "${HOST_OS}" = "Linux" ] && [ "${TARGET}" = "i686-pc-windows-msvc" ]; then
cargo xwin build --manifest-path "${HELPER_DIR}/Cargo.toml" --release --target "${TARGET}"
if [ "${HOST_OS}" = "Linux" ] && [ "${TARGET}" = "x86_64-pc-windows-msvc" ]; then
cargo xwin build --manifest-path "${HELPER_DIR}/Cargo.toml" --release --target "${TARGET}" --xwin-arch x86_64
else
cargo build --manifest-path "${HELPER_DIR}/Cargo.toml" --release --target "${TARGET}"
fi