diff --git a/README.md b/README.md index 5ac7773..88372a8 100644 --- a/README.md +++ b/README.md @@ -37,24 +37,24 @@ If you already have `wintun.vcxproj.user` file, just add the `` s Open _Developer Command Prompt for VS 2017_ and use the `msbuild` command: ``` -msbuild wintun.proj [/t:] [/p:Configuration=] [/p:Platform=] +msbuild wintun.proj [/t:] ``` ### Targets - - `Build`: Builds the driver. This is the default target. + - `Build`: Builds the driver release configurations of all supported platforms. This is the default target. - `Clean`: Deletes all intermediate and output files. - `Rebuild`: Alias for `Clean` followed by `Build`. - - `SDV`: Runs Static Driver Verifier, which includes a clean driver build, only for release configurations. + - `SDV`: Runs Static Driver Verifier, which includes a clean driver build, only for AMD64 release configuration. - - `DVL`: Runs the `SDV`, and creates a Driver Verification Log, only for release configurations. + - `DVL`: Runs the `SDV`, and creates a Driver Verification Log, only for AMD64 release configurations. - - `MSM`: Builds Microsoft Installer Merge Module in `\wintun--.msm`. + - `MSM`: Builds Microsoft Installer Merge Modules in `\wintun--.msm`. -The driver output folder is: +The driver output folders are: Platform and Configuration | Folder -------------------------- | -------------------- @@ -65,14 +65,6 @@ AMD64 Release | `amd64\Release\wintun` ARM64 Debug | `arm64\Debug\wintun` ARM64 Release | `arm64\Release\wintun` -### Properties - -Properties may be defined as environment variables, or specified on the `msbuild` command line. - - - `Configuration`: Specifies configuration to build or clean. May be `Debug` or `Release` (default). - - - `Platform`: Specifies driver platform to build. May be `x86` or `amd64` (default), or `arm64`. - ## Usage diff --git a/wintun.proj b/wintun.proj index 6764197..68e9122 100644 --- a/wintun.proj +++ b/wintun.proj @@ -11,31 +11,15 @@ - - Release - amd64 - $(Platform)\$(Configuration)\ - - - - Win32 - x86 - - - x64 - x64 - - - ARM64 - arm64 - - - + + - + + + @@ -46,24 +30,40 @@ Driver Building Note: Use explicit Inputs/Outputs as WindowsDriver.Common.targets triggers driver re-packaging and signing on every invocation. --> - + Properties="Configuration=Release;Platform=Win32"/> + + + + + + + Outputs="$(SDVDir)SDV.DVL.xml;amd64\Release\vc.nativecodeanalysis.all.xml"> + Properties="Inputs=/check:*;Configuration=Release;Platform=x64"/> - - $(DistributionDir) - wintun-$(WintunPlatform)-$(WintunVersionStr) - .msm - $(MSMName)$(MSMExt) - $(MSMDir)$(MSMFileName) - - + Outputs="$(DistributionDir)wintun-x86-$(WintunVersionStr).msm"> + Properties="Configuration=Release;Platform=x86"/> + + +