Merge pull request #288 in FS/freeswitch from ~MICHAELGG/freeswitch:winperf to master

* commit '81190c6d89aa7bedbda041c8a8519081856effff':
  FS-7644. Fix build on VS2013/Win by creating and forcing nf (nofork) to true.
  FS-7644. Remove non-existent projects.
  FS-7644. Add switch_core_video.c and switch_vidderbuffer.c to VS2013 FreeSwitchCore.2013.vcxproj
  FS-7644. Change 2013.vcxproj references to 2013
This commit is contained in:
Mike Jerris
2015-06-18 15:35:02 -05:00
135 changed files with 275 additions and 308 deletions

View File

@@ -252,7 +252,7 @@
<ClCompile Include="mod_amr.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2012.vcxproj">
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2013.vcxproj">
<Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>

View File

@@ -128,11 +128,11 @@
<ClCompile Include="mod_bv.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\libs\broadvoice\src\libbroadvoice.2012.vcxproj">
<ProjectReference Include="..\..\..\..\libs\broadvoice\src\libbroadvoice.2013.vcxproj">
<Project>{cf70f278-3364-4395-a2e1-23501c9b8ad2}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2012.vcxproj">
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2013.vcxproj">
<Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>

View File

@@ -257,11 +257,11 @@
<ClCompile Include="mod_g723_1.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\libs\win32\apr\libapr.2012.vcxproj">
<ProjectReference Include="..\..\..\..\libs\win32\apr\libapr.2013.vcxproj">
<Project>{f6c55d93-b927-4483-bb69-15aef3dd2dff}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2012.vcxproj">
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2013.vcxproj">
<Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>

View File

@@ -260,7 +260,7 @@
<ClCompile Include="mod_g729.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2012.vcxproj">
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2013.vcxproj">
<Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>

View File

@@ -132,7 +132,7 @@
<ClCompile Include="mod_h26x.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2012.vcxproj">
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2013.vcxproj">
<Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>

View File

@@ -132,11 +132,11 @@
<ClCompile Include="mod_ilbc.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\libs\ilbc\libilbc.2012.vcxproj">
<ProjectReference Include="..\..\..\..\libs\ilbc\libilbc.2013.vcxproj">
<Project>{9a5ddf08-c88c-4a35-b7f6-d605228446bd}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2012.vcxproj">
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2013.vcxproj">
<Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>

View File

@@ -215,7 +215,7 @@
<ClCompile Include="webrtc_fft_t_rad.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2012.vcxproj">
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2013.vcxproj">
<Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>

View File

@@ -132,7 +132,7 @@
<ClCompile Include="mod_opus.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\libs\win32\opus\opus.2012.vcxproj">
<ProjectReference Include="..\..\..\..\libs\win32\opus\opus.2013.vcxproj">
<Project>{FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}</Project>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
<Private>false</Private>
@@ -140,16 +140,16 @@
<LinkLibraryDependencies>true</LinkLibraryDependencies>
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
</ProjectReference>
<ProjectReference Include="..\..\..\..\libs\win32\opus\opus.celt.2012.vcxproj">
<ProjectReference Include="..\..\..\..\libs\win32\opus\opus.celt.2013.vcxproj">
<Project>{245603e3-f580-41a5-9632-b25fe3372cbf}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\..\libs\win32\opus\opus.silk_common.2012.vcxproj">
<ProjectReference Include="..\..\..\..\libs\win32\opus\opus.silk_common.2013.vcxproj">
<Project>{c303d2fc-ff97-49b8-9ddd-467b4c9a0b16}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\..\libs\win32\opus\opus.silk_float.2012.vcxproj">
<ProjectReference Include="..\..\..\..\libs\win32\opus\opus.silk_float.2013.vcxproj">
<Project>{9c4961d2-5ddb-40c7-9be8-ca918dc4e782}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2012.vcxproj">
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2013.vcxproj">
<Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>

View File

@@ -129,11 +129,11 @@
<ClCompile Include="mod_silk.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\libs\silk\src\Silk_FIX.2012.vcxproj">
<ProjectReference Include="..\..\..\..\libs\silk\src\Silk_FIX.2013.vcxproj">
<Project>{56b91d01-9150-4bbf-afa1-5b68ab991b76}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2012.vcxproj">
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2013.vcxproj">
<Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>

View File

@@ -128,11 +128,11 @@
<ClCompile Include="mod_siren.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\libs\win32\libg722_1\libg722_1.2012.vcxproj">
<ProjectReference Include="..\..\..\..\libs\win32\libg722_1\libg722_1.2013.vcxproj">
<Project>{1bc8a8ec-e03b-44df-bcd9-088650f4d29c}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2012.vcxproj">
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2013.vcxproj">
<Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>