mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-07-04 19:31:56 +00:00
FS-11288: [Build-System] Refactor WIX project to not miss modules in msi on slow machines. Move Windows build logic from legacy util.vbs to modern props. Fix sound packages improper extraction. Fix multiprocessor build under msbuild.
This commit is contained in:
@@ -24,6 +24,8 @@
|
||||
<RootNamespace>libx264</RootNamespace>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<Import Project="$(SolutionDir)\w32\vsyasm.props" Condition=" '$(vsyasmPropsImported)' == '' " />
|
||||
<Import Project="$(SolutionDir)\w32\download_libx264.props" Condition=" '$(libx264PropsImported)' == '' " />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
@@ -491,11 +493,6 @@ del /f /q $(OutDir)\x264.txt
|
||||
<AdditionalIncludeDirectories>$(VC_IncludePath)\;$(WindowsSDK_IncludePath)\;$(VCInstallDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ResourceCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Download libx264.2017.vcxproj">
|
||||
<Project>{6d1bc01c-3f97-4c08-8a45-69c9b94281aa}</Project>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
<Import Project="$(SolutionDir)libs\win32\libx264\vsyasm.targets" />
|
||||
|
||||
Reference in New Issue
Block a user