diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-11-03 16:10:16 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-11-03 16:10:16 +0100 |
| commit | 55345ae386c73277d08c21a3ee1be379a28b8ffd (patch) | |
| tree | 1b033c4dad51140b09f8eef2d5b743e6ebfb0c6c | |
| parent | api: move undocumented ntdll symbols to ntdll.h (diff) | |
| download | wintun-55345ae386c73277d08c21a3ee1be379a28b8ffd.tar.xz wintun-55345ae386c73277d08c21a3ee1be379a28b8ffd.zip | |
api: move nci.lib generation to custom step
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | api/api.vcxproj | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/api/api.vcxproj b/api/api.vcxproj index a60a7de..f75cb0d 100644 --- a/api/api.vcxproj +++ b/api/api.vcxproj @@ -115,10 +115,12 @@ <PreprocessorDefinitions Condition="'$(Platform)'=='ARM'">_M_ARM=7;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Platform)'=='ARM64'">_M_ARM64=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ResourceCompile> - <PreLinkEvent Condition="!exists('$(IntDir)nci.lib')"> - <Command>cl.exe /nologo /DGENERATE_LIB /Ob0 /c /Fo"$(IntDir)nci.obj" /Tc nci.h -lib.exe /def:nci.def /out:"$(IntDir)nci.lib" /machine:$(PlatformTarget) /nologo "$(IntDir)nci.obj"</Command> - </PreLinkEvent> + <CustomBuildStep> + <Command>cl.exe /nologo /DGENERATE_LIB /Ob0 /c /Fo"$(IntDir)nci.obj" /Tc "$(ProjectDir)nci.h" +lib.exe /def:"$(ProjectDir)nci.def" /out:"$(IntDir)nci.lib" /machine:$(PlatformTarget) /nologo "$(IntDir)nci.obj"</Command> + <Outputs>$(IntDir)nci.lib</Outputs> + <Inputs>$(ProjectDir)nci.def;$(ProjectDir)nci.h</Inputs> + </CustomBuildStep> <Link> <DelayLoadDLLs>bcrypt.dll;iphlpapi.dll;nci.dll;newdev.dll;version.dll</DelayLoadDLLs> <AdditionalDependencies>Bcrypt.lib;Crypt32.lib;Cfgmgr32.lib;Iphlpapi.lib;$(IntDir)nci.lib;newdev.lib;ntdll.lib;Setupapi.lib;shlwapi.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -189,6 +191,7 @@ lib.exe /def:nci.def /out:"$(IntDir)nci.lib" /machine:$(PlatformTarget) /nologo <CleanDependsOn>CleanSignTarget;$(CleanDependsOn)</CleanDependsOn> <SignTargetCommandLine Condition="$(SignMode)=='TestSign'">"$(SignToolPath)" sign /sha1 "$(TestCertificate)" /fd sha256 "$(TargetPath)"</SignTargetCommandLine> <SignTargetCommandLine Condition="$(SignMode)=='ProductionSign'">"$(SignToolPath)" sign /sha1 "$(ProductionCertificate)" /fd sha256 /tr "$(TimeStampServer)" /td sha256 "$(TargetPath)"</SignTargetCommandLine> + <CustomBuildBeforeTargets>Link</CustomBuildBeforeTargets> </PropertyGroup> <Target Name="SignTarget" Condition="'$(SignTargetCommandLine)'!=''" Inputs="$(TargetPath)" Outputs="$(IntermediateOutputPath)$(TargetName).sign"> <Exec Command="$(SignTargetCommandLine)" /> |