kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1560 in FS/freeswitch from ~ANDYWOLK/freeswitch:FS-11303-migrate-visual-c-components-redistribution to master 

* commit '144bbec7fded8318750cfa9595631505dcdcb097':
  FS-11303: [Build-System] Migrate Visual C++ components redistribution using merge modules from v140 to v141 (VS2017), minor cleanup.
This commit is contained in:
Mike Jerris 2018-08-01 17:52:03 +00:00
parent 36468ee6f4 144bbec7fd
commit 8f4831a8c6
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/win32/sofia/libsofia_sip_ua_static.2017.vcxproj
View File

@ -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>

4
w32/Setup/Product.2017.wxs
View File

@ -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 ?>

12
w32/Setup/Setup.2017.wixproj
View File

@ -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>