diff --git a/libs/win32/sofia/libsofia_sip_ua_static.2017.vcxproj b/libs/win32/sofia/libsofia_sip_ua_static.2017.vcxproj index 40bead239f..adc8d9fd5e 100644 --- a/libs/win32/sofia/libsofia_sip_ua_static.2017.vcxproj +++ b/libs/win32/sofia/libsofia_sip_ua_static.2017.vcxproj @@ -511,10 +511,6 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" <ClInclude Include="..\..\sofia-sip\libsofia-sip-ua\soa\sofia-sip\soa_tag.h" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\Download PTHREAD.2017.vcxproj"> - <Project>{8b3b4c4c-13c2-446c-beb0-f412cc2cfb9a}</Project> - <ReferenceOutputAssembly>false</ReferenceOutputAssembly> - </ProjectReference> <ProjectReference Include="..\pthread\pthread.2017.vcxproj"> <Project>{df018947-0fff-4eb3-bdee-441dc81da7a4}</Project> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> diff --git a/w32/Setup/Product.2017.wxs b/w32/Setup/Product.2017.wxs index bbda12f1c8..9290112d5a 100644 --- a/w32/Setup/Product.2017.wxs +++ b/w32/Setup/Product.2017.wxs @@ -63,13 +63,13 @@ <!-- </Component> --> <?if $(var.Platform) != x64 ?> <Merge Id="CrtFiles_x86" - SourceFile="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_$(var.CRT_Configuration)CRT_x86.msm" + SourceFile="$(var.MergeModules)\Microsoft_VC$(var.VCVer)_$(var.CRT_Configuration)CRT_x86.msm" DiskId="1" Language="1033"/> <?endif ?> <?if $(var.Platform) = x64 ?> <Merge Id="CrtFiles_x64" - SourceFile="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_$(var.CRT_Configuration)CRT_x64.msm" + SourceFile="$(var.MergeModules)\Microsoft_VC$(var.VCVer)_$(var.CRT_Configuration)CRT_x64.msm" DiskId="1" Language="1033"/> <?endif ?> diff --git a/w32/Setup/Setup.2017.wixproj b/w32/Setup/Setup.2017.wixproj index ec06ec997f..6e608b82fc 100644 --- a/w32/Setup/Setup.2017.wixproj +++ b/w32/Setup/Setup.2017.wixproj @@ -4,6 +4,7 @@ <GitSkipCache>true</GitSkipCache> </PropertyGroup> <ImportGroup Label="PropertySheets"> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Common.props" /> <Import Project="..\sound_tools.props" /> <Import Project="GitInfo\GitInfo.targets" /> </ImportGroup> @@ -915,9 +916,18 @@ <CreateProperty Condition="$(FullVersion) != ''" Value="$(SolutionDir)$(UserFriendlyPlatform)\$(OutputName)-$(FullVersion)$(Revision)$(SnapshotName)-$(UserFriendlyPlatform)-$(Configuration).msi"> <Output TaskParameter="Value" PropertyName="DestinationFileName" /> </CreateProperty> - <CreateProperty Value="FreeSWITCHSoundFilesDir=$(SoundsDir);$(DefineConstants)"> + <CreateProperty Value="$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64@Major).$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64@Minor).$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64@Bld)"> + <Output TaskParameter="Value" PropertyName="VCLibVersion" /> + </CreateProperty> + <CreateProperty Value="$(VSInstallDir)\VC\Redist\MSVC\$(VCLibVersion)\MergeModules\"> + <Output TaskParameter="Value" PropertyName="MergeModules" /> + </CreateProperty> + <CreateProperty Value="FreeSWITCHSoundFilesDir=$(SoundsDir);MergeModules=$(MergeModules);VCVer=$(PlatformToolsetVersion);$(DefineConstants)"> <Output TaskParameter="Value" PropertyName="DefineConstants" /> </CreateProperty> + <Message Importance="High" Text="Visual C++ lib-version: $(VCLibVersion)" /> + <Message Importance="High" Text="PlatformToolsetVersion: $(PlatformToolsetVersion)" /> + <Message Importance="High" Text="VSInstallDir: $(VSInstallDir)" /> <Message Importance="High" Text="SoundsDir: $(SoundsDir)" /> <Message Importance="High" Text="DefineConstants: $(DefineConstants)" /> </Target>