Hesham/wintun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MSM: Migrate WiX command line options to appropriate ItemGroups

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2019-04-19 20:21:47 +02:00
parent 532156de82
commit 38f44fe46c
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wintun.wixproj
View File

@ -26,9 +26,8 @@
<OutputName>$(ProjectName)</OutputName> <OutputName>$(ProjectName)</OutputName>
<DefineConstants>WINTUN_VERSION=$(WintunVersion);$(DefineConstants)</DefineConstants> <DefineConstants>WINTUN_VERSION=$(WintunVersion);$(DefineConstants)</DefineConstants>
<SuppressSpecificWarnings>1006;1086;$(SuppressSpecificWarnings)</SuppressSpecificWarnings> <SuppressSpecificWarnings>1006;1086;$(SuppressSpecificWarnings)</SuppressSpecificWarnings>
<CompilerAdditionalOptions>-ext WixDifxAppExtension -ext WixIIsExtension $(CompilerAdditionalOptions)</CompilerAdditionalOptions>
<LinkerSuppressSpecificWarnings>1103;$(LinkerSuppressSpecificWarnings)</LinkerSuppressSpecificWarnings> <LinkerSuppressSpecificWarnings>1103;$(LinkerSuppressSpecificWarnings)</LinkerSuppressSpecificWarnings>
<LinkerAdditionalOptions>-ext WixDifxAppExtension -ext WixIIsExtension -b output_dir="$(IntermediateOutputPath.TrimEnd('\'))" $(LinkerAdditionalOptions)</LinkerAdditionalOptions> <LinkerAdditionalOptions>-b output_dir="$(IntermediateOutputPath.TrimEnd('\'))" $(LinkerAdditionalOptions)</LinkerAdditionalOptions>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Release'"> <PropertyGroup Condition="'$(Configuration)'=='Release'">
<SuppressPdbOutput>true</SuppressPdbOutput> <SuppressPdbOutput>true</SuppressPdbOutput>
@ -40,7 +39,20 @@
<Compile Include="wintun.wxs"/> <Compile Include="wintun.wxs"/>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<WixLibrary Include="difxapp_$(Platform).wixlib"/> <WixExtension Include="WixDifxAppExtension">
<HintPath>$(WixExtDir)\WixDifxAppExtension.dll</HintPath>
<Name>WixDifxAppExtension</Name>
</WixExtension>
<WixExtension Include="WixIIsExtension">
<HintPath>$(WixExtDir)\WixIIsExtension.dll</HintPath>
<Name>WixIIsExtension</Name>
</WixExtension>
</ItemGroup>
<ItemGroup>
<WixLibrary Include="difxapp_$(Platform).wixlib">
<HintPath>$(WixExtDir)\difxapp_$(Platform).wixlib</HintPath>
<Name>difxapp</Name>
</WixLibrary>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildProjectName).user" Condition="exists('$(MSBuildProjectName).user')"/> <Import Project="$(MSBuildProjectName).user" Condition="exists('$(MSBuildProjectName).user')"/>