Skip to content

F
freeswitch
提交 53d912b3 authored 作者: Mike Jerris's avatar Mike Jerris
浏览文件
操作

Merge pull request #10 in FSA/freeswitch-advantage from… 

Merge pull request #10 in FSA/freeswitch-advantage from ~ANDYWOLK/freeswitch-advantage:bugfix/FS-11020-add-missing-modules-to-the-msi-installer to v1.8-fsa

* commit '22a2c0af':
  FS-11020: [Build-System] On Windows: Add missing modules to the msi installer, fix mod_gsmopen build, remove mod_skyopen, disable libav and libx264, cleanup.
上级 72d4c532 22a2c0af
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 103 行增加 和 74 行删除
Freeswitch.2015.sln
浏览文件 @ 53d912b3
差异被折叠。
src/mod/asr_tts/mod_flite/mod_flite.2015.vcxproj
浏览文件 @ 53d912b3
......@@ -260,10 +260,6 @@
<ClCompile Include="mod_flite.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\libs\win32\Download FLITE.2015.vcxproj">
<Project>{d5d2bf72-29fe-4982-a9fa-82fdd086db1b}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\..\..\libs\win32\flite\flite.2015.vcxproj">
<Project>{0ad1177e-1fd8-4643-9391-431467a11084}</Project>
</ProjectReference>
......
src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2015.vcxproj
浏览文件 @ 53d912b3
......@@ -191,18 +191,6 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\libs\win32\Download pocketsphinx.2015.vcxproj">
<Project>{af8163ee-fa76-4904-a11d-7d70a1b5ba2e}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\..\..\libs\win32\Download sphinxbase.2015.vcxproj">
<Project>{4f92b672-dadb-4047-8d6a-4bb3796733fd}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\..\..\libs\win32\Download sphinxmodel.2015.vcxproj">
<Project>{2dee4895-1134-439c-b688-52203e57d878}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\..\..\libs\win32\pocketsphinx\pocketsphinx.2015.vcxproj">
<Project>{94001a0e-a837-445c-8004-f918f10d0226}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
......
src/mod/endpoints/mod_gsmopen/mod_gsmopen.2015.vcxproj
浏览文件 @ 53d912b3
......@@ -70,27 +70,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NativeMinimumRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<RunCodeAnalysis>false</RunCodeAnalysis>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
......
w32/Setup/Setup.2015.wixproj
浏览文件 @ 53d912b3
......@@ -249,6 +249,30 @@
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
<ProjectReference Include="..\..\src\mod\applications\mod_redis\mod_redis.2015.vcxproj">
<Name>mod_redis</Name>
<Project>{886b5e9d-f2c2-4af2-98c8-ef98c4c770e6}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
<ProjectReference Include="..\..\src\mod\applications\mod_rss\mod_rss.2015.vcxproj">
<Name>mod_rss</Name>
<Project>{b69247fa-ecd6-40ed-8e44-5ca6c3baf9a4}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
<ProjectReference Include="..\..\src\mod\applications\mod_sms\mod_sms.2015.vcxproj">
<Name>mod_sms</Name>
<Project>{2469b306-b027-4ff2-8815-c9c1ea2cae79}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
<ProjectReference Include="..\..\src\mod\applications\mod_snom\mod_snom.2015.vcxproj">
<Name>mod_snom</Name>
<Project>{2a3d00c6-588d-4e86-81ac-9ef5ede86e03}</Project>
......@@ -265,6 +289,22 @@
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
<ProjectReference Include="..\..\src\mod\applications\mod_spy\mod_spy.2015.vcxproj">
<Name>mod_spy</Name>
<Project>{a61d7cb4-75a5-4a55-8ca1-be5af615d921}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
<ProjectReference Include="..\..\src\mod\applications\mod_valet_parking\mod_valet_parking.2015.vcxproj">
<Name>mod_valet_parking</Name>
<Project>{432db165-1eb2-4781-a9c0-71e62610b20a}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
<ProjectReference Include="..\..\src\mod\applications\mod_vmd\mod_vmd.2015.vcxproj">
<Name>mod_vmd</Name>
<Project>{14e4a972-9cfb-436d-b0a5-4943f3f80d47}</Project>
......@@ -297,6 +337,14 @@
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
<ProjectReference Include="..\..\src\mod\asr_tts\mod_unimrcp\mod_unimrcp.2015.vcxproj">
<Name>mod_unimrcp</Name>
<Project>{d07c378a-f5f7-438f-adf3-4ac4fb1883cd}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
<ProjectReference Include="..\..\src\mod\codecs\mod_amr\mod_amr.2015.vcxproj">
<Name>mod_amr</Name>
<Project>{8deb383c-4091-4f42-a56f-c9e46d552d79}</Project>
......@@ -313,6 +361,14 @@
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
<ProjectReference Include="..\..\src\mod\codecs\mod_codec2\mod_codec2.vcxproj">
<Name>mod_codec2</Name>
<Project>{cb4e68a1-8d19-4b5e-87b9-97a895e1ba17}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
<ProjectReference Include="..\..\src\mod\codecs\mod_g723_1\mod_g723_1.2015.vcxproj">
<Name>mod_g723_1</Name>
<Project>{fea1eef7-876f-48de-88bf-c0e3e606d758}</Project>
......@@ -361,6 +417,14 @@
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
<ProjectReference Include="..\..\src\mod\codecs\mod_silk\mod_silk.2015.vcxproj">
<Name>mod_silk</Name>
<Project>{afa983d6-4569-4f88-ba94-555ed00fd9a8}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
<ProjectReference Include="..\..\src\mod\codecs\mod_siren\mod_siren.2015.vcxproj">
<Name>mod_siren</Name>
<Project>{0b6c905b-142e-4999-b39d-92ff7951e921}</Project>
......@@ -409,6 +473,14 @@
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
<ProjectReference Include="..\..\src\mod\endpoints\mod_gsmopen\mod_gsmopen.2015.vcxproj">
<Name>mod_gsmopen</Name>
<Project>{74b120ff-6935-4dfe-a142-cdb6bea99c90}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
<ProjectReference Include="..\..\src\mod\endpoints\mod_loopback\mod_loopback.2015.vcxproj">
<Name>mod_loopback</Name>
<Project>{b3f424ec-3d8f-417c-b244-3919d5e1a577}</Project>
......@@ -417,6 +489,14 @@
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
<ProjectReference Include="..\..\src\mod\endpoints\mod_portaudio\mod_PortAudio.2015.vcxproj">
<Name>mod_PortAudio</Name>
<Project>{5fd31a25-5d83-4794-8bee-904dad84ce71}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
<ProjectReference Include="..\..\src\mod\endpoints\mod_rtc\mod_rtc.2015.vcxproj">
<Name>mod_rtc</Name>
<Project>{3884add2-91d0-4cd6-86d3-d5fb2d4aab9e}</Project>
......@@ -441,14 +521,6 @@
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
<ProjectReference Include="..\..\src\mod\endpoints\mod_skypopen\mod_skypopen.2015.vcxproj">
<Name>mod_skypopen</Name>
<Project>{c6e78a4c-db1e-47f4-9b63-4dc27d86343f}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
<ProjectReference Include="..\..\src\mod\endpoints\mod_sofia\mod_sofia.2015.vcxproj">
<Name>mod_sofia</Name>
<Project>{0df3abd0-ddc0-4265-b778-07c66780979b}</Project>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论