From 16ea5be0fa137361a4f1598944299049f01c89c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20L=C3=B6nnhager?= Date: Tue, 6 Aug 2024 13:09:59 +0200 Subject: [PATCH 1/2] Update inf2cat.exe path in build.bat --- build.bat | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.bat b/build.bat index 02254ad..46214f1 100644 --- a/build.bat +++ b/build.bat @@ -14,6 +14,11 @@ if "%CAB_ARCH%"=="x64" ( set CAB_ARCH=amd64 ) +set INF2CAT_OS=10_%VSCMD_ARG_TGT_ARCH% +if "%VSCMD_ARG_TGT_ARCH%"=="arm64" ( + set INF2CAT_OS=10_VB_%VSCMD_ARG_TGT_ARCH% +) + set ROOT=%~dp0 :: Force complete rebuild @@ -36,7 +41,7 @@ IF %ERRORLEVEL% NEQ 0 goto ERROR :: Re-generate catalog file now that driver binary has changed del %ROOT%bin\%VSCMD_ARG_TGT_ARCH%-Release\mullvad-split-tunnel\mullvad-split-tunnel.cat -"%WindowsSdkBinPath%x86\inf2cat.exe" /driver:%ROOT%bin\%VSCMD_ARG_TGT_ARCH%-Release\mullvad-split-tunnel /os:"10_%VSCMD_ARG_TGT_ARCH%" /verbose +"%WindowsSdkVerBinPath%x86\inf2cat.exe" /driver:%ROOT%bin\%VSCMD_ARG_TGT_ARCH%-Release\mullvad-split-tunnel /os:"%INF2CAT_OS%" /verbose IF %ERRORLEVEL% NEQ 0 goto ERROR From 40673377701656475024b921fa4a9e68083fe53a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20L=C3=B6nnhager?= Date: Mon, 12 Aug 2024 14:58:33 +0200 Subject: [PATCH 2/2] Bump version to 1.2.4 --- CHANGELOG.md | 4 ++++ src/version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6b3226..1db7576 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,10 @@ Line wrap the file at 100 chars. Th ## [Unreleased] +## [1.2.4.0] - 2024-08-12 +### Fixed +- Fix build scripts for ARM64. + ## [1.2.3.0] - 2024-07-26 ### Added diff --git a/src/version.h b/src/version.h index e14ba22..9a6eb35 100644 --- a/src/version.h +++ b/src/version.h @@ -2,5 +2,5 @@ #define DRIVER_VERSION_MAJOR 1 #define DRIVER_VERSION_MINOR 2 -#define DRIVER_VERSION_PATCH 3 +#define DRIVER_VERSION_PATCH 4 #define DRIVER_VERSION_BUILD 0