Merge branch 'update-inf2cat-path'

This commit is contained in:
David Lönnhager
2024-08-12 15:03:40 +02:00
3 changed files with 11 additions and 2 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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