diff options
| author |   Simon Rozman <simon@rozman.si> | 2019-04-15 13:14:42 +0200 |
|---|---|---|
| committer | Simon Rozman <simon@rozman.si> | 2019-04-15 13:35:23 +0200 |
| commit | afef39616c0ee6ad678f3da293570f1f23e208b4 (patch) | |
| tree | 5b4f755e1314baf988b2d598174ce3aae33b6552 | |
| parent | Fixup readme markdown formatting (diff) | |
| download | wintun-afef39616c0ee6ad678f3da293570f1f23e208b4.tar.xz wintun-afef39616c0ee6ad678f3da293570f1f23e208b4.zip | |
Revise architecture naming convention
Adopt PROCESSOR_ARCHITECTURE environment variable platform designation,
make it lowercase, and unify output folder naming.
Signed-off-by: Simon Rozman <simon@rozman.si>
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | Makefile | 15 | ||||
| -rw-r--r-- | README.md | 10 | ||||
| -rw-r--r-- | wintun.vcxproj | 16 |
4 files changed, 27 insertions, 22 deletions
@@ -3,10 +3,10 @@ *.user # Build Output -/Release -/Debug -/x64/Release -/x64/Debug +/x86/Release +/x86/Debug +/amd64/Release +/amd64/Debug # Static Driver Verifier Output /sdv @@ -8,14 +8,19 @@ CFG=Release !ENDIF !IFNDEF PLAT -PLAT=x64 +PLAT=amd64 !ENDIF -!IF "$(PLAT)" == "Win32" -OUTPUT_DIR=$(CFG) +!IF "$(PLAT)" == "x86" || "$(PLAT)" == "X86" +PLAT=x86 +PLAT_MSBUILD=Win32 +!ELSEIF "$(PLAT)" == "amd64" || "$(PLAT)" == "AMD64" +PLAT=amd64 +PLAT_MSBUILD=x64 !ELSE -OUTPUT_DIR=$(PLAT)\$(CFG) +!ERROR Invalid platform "$(PLAT)". PLAT must be "x86" or "amd64". !ENDIF -MSBUILD_FLAGS=/p:Configuration="$(CFG)" /p:Platform="$(PLAT)" /m /v:minimal /nologo +OUTPUT_DIR=$(PLAT)\$(CFG) +MSBUILD_FLAGS=/p:Configuration="$(CFG)" /p:Platform="$(PLAT_MSBUILD)" /m /v:minimal /nologo build :: msbuild.exe "wintun.vcxproj" /t:Build $(MSBUILD_FLAGS) @@ -51,10 +51,10 @@ The driver output folder is: Platform and Configuration | Folder -------------------------- | -------------------- -x86 Debug | `Debug\wintun` -x86 Release | `Release\wintun` -AMD64 Debug | `x64\Debug\wintun` -AMD64 Release | `x64\Release\wintun` +x86 Debug | `x86\Debug\wintun` +x86 Release | `x86\Release\wintun` +AMD64 Debug | `amd64\Debug\wintun` +AMD64 Release | `amd64\Release\wintun` ### Properties @@ -62,7 +62,7 @@ Properties may be defined as environment variables, or specified on the `nmake` - `CFG`: Specifies configuration to build or clean. May be `Debug` or `Release` (default). - - `PLAT`: Specifies driver platform to build. May be `Win32` or `x64` (default). + - `PLAT`: Specifies driver platform to build. May be `x86` or `amd64` (default). ## Usage diff --git a/wintun.vcxproj b/wintun.vcxproj index 448d30d..e5cec0c 100644 --- a/wintun.vcxproj +++ b/wintun.vcxproj @@ -85,26 +85,26 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <RunCodeAnalysis>true</RunCodeAnalysis> <CodeAnalysisRuleSet>$(WDKContentRoot)CodeAnalysis\DriverMustFixRules.ruleset</CodeAnalysisRuleSet> - <IntDir>$(ConfigurationName)\</IntDir> - <OutDir>$(ConfigurationName)\</OutDir> + <IntDir>x86\$(ConfigurationName)\</IntDir> + <OutDir>x86\$(ConfigurationName)\</OutDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <RunCodeAnalysis>true</RunCodeAnalysis> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - <IntDir>$(ConfigurationName)\</IntDir> - <OutDir>$(ConfigurationName)\</OutDir> + <IntDir>x86\$(ConfigurationName)\</IntDir> + <OutDir>x86\$(ConfigurationName)\</OutDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <RunCodeAnalysis>true</RunCodeAnalysis> <CodeAnalysisRuleSet>$(WDKContentRoot)CodeAnalysis\DriverMustFixRules.ruleset</CodeAnalysisRuleSet> - <IntDir>$(Platform)\$(ConfigurationName)\</IntDir> - <OutDir>$(Platform)\$(ConfigurationName)\</OutDir> + <IntDir>amd64\$(ConfigurationName)\</IntDir> + <OutDir>amd64\$(ConfigurationName)\</OutDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <RunCodeAnalysis>true</RunCodeAnalysis> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - <IntDir>$(Platform)\$(ConfigurationName)\</IntDir> - <OutDir>$(Platform)\$(ConfigurationName)\</OutDir> + <IntDir>amd64\$(ConfigurationName)\</IntDir> + <OutDir>amd64\$(ConfigurationName)\</OutDir> </PropertyGroup> <ItemDefinitionGroup> <ClCompile> |