File tree 2 files changed +3
-2
lines changed
Tools/msi/bundle/bootstrap 2 files changed +3
-2
lines changed Original file line number Diff line number Diff line change
1
+ Fixes Windows installer build to work with latest compilers.
Original file line number Diff line number Diff line change 21
21
<PropertyGroup Label =" Globals" >
22
22
<Configuration Condition =" '$(Configuration)' == ''" >Release</Configuration >
23
23
<Platform Condition =" '$(Platform)' == ''" >Win32</Platform >
24
+ <!-- v143 is not supported by the version of WiX Toolset obtained by get_externals.bat -->
24
25
<PlatformToolset Condition =" '$(PlatformToolset)' == '' and '$(VisualStudioVersion)' == '17.0'" >v143</PlatformToolset >
25
26
<PlatformToolset Condition =" '$(PlatformToolset)' == '' and '$(VisualStudioVersion)' == '16.0'" >v142</PlatformToolset >
26
27
<PlatformToolset Condition =" '$(PlatformToolset)' == '' and ('$(MSBuildToolsVersion)' == '15.0' or '$(VisualStudioVersion)' == '15.0')" >v141</PlatformToolset >
49
50
</ClCompile >
50
51
<Link >
51
52
<AdditionalDependencies >comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib;dutil.lib;balutil.lib;version.lib;uxtheme.lib;%(AdditionalDependencies)</AdditionalDependencies >
52
- <AdditionalLibraryDirectories Condition =" '$(PlatformToolset)' == 'v142'" >$(WixInstallPath)sdk\vs2017\lib\x86</AdditionalLibraryDirectories >
53
- <AdditionalLibraryDirectories Condition =" '$(PlatformToolset)' == 'v141'" >$(WixInstallPath)sdk\vs2017\lib\x86</AdditionalLibraryDirectories >
53
+ <AdditionalLibraryDirectories Condition =" $(PlatformToolset.StartsWith(`v14`))" >$(WixInstallPath)sdk\vs2017\lib\x86</AdditionalLibraryDirectories >
54
54
<AdditionalLibraryDirectories Condition =" '$(PlatformToolset)' == 'v140'" >$(WixInstallPath)sdk\vs2015\lib\x86</AdditionalLibraryDirectories >
55
55
<AdditionalLibraryDirectories Condition =" '$(PlatformToolset)' == 'v120'" >$(WixInstallPath)sdk\vs2013\lib\x86</AdditionalLibraryDirectories >
56
56
<ModuleDefinitionFile >pythonba.def</ModuleDefinitionFile >
You can’t perform that action at this time.
0 commit comments