Merge pull request #1557 in FS/freeswitch from ~ANDYWOLK/freeswitch:bugfix/FS-11295-mod_av-fix-wrong-path-to-yasm.exe to master

* commit '6712f3998fad7604b197fbc7168e3feb4a36fba8':
  FS-11295: [mod_av] Fix wrong path to yasm.exe
This commit is contained in:
Mike Jerris 2018-07-30 21:03:07 +00:00
commit 3931e8b68c

View File

@ -32,26 +32,26 @@
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>false</WholeProgramOptimization>
<YasmCommand>$(SolutionDir)libs\yasm.exe -f win32 -DPREFIX -I./../../libav/ -P.\..\..\libs\libav\config_x86\config.asm</YasmCommand>
<YasmCommand>yasm.exe -f win32 -DPREFIX -I./../../libav/ -P.\..\..\libs\libav\config_x86\config.asm</YasmCommand>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<YasmCommand>$(SolutionDir)libs\yasm.exe -f win32 -DPREFIX -I./../../libav/ -P.\..\..\libs\libav\config_x86\config.asm</YasmCommand>
<YasmCommand>yasm.exe -f win32 -DPREFIX -I./../../libav/ -P.\..\..\libs\libav\config_x86\config.asm</YasmCommand>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>false</WholeProgramOptimization>
<YasmCommand>$(SolutionDir)libs\yasm.exe -f x64 -I./../../libav/ -P.\..\..\libs\libav\config_x64\config.asm</YasmCommand>
<YasmCommand>yasm.exe -f x64 -I./../../libav/ -P.\..\..\libs\libav\config_x64\config.asm</YasmCommand>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<YasmCommand>$(SolutionDir)libs\yasm.exe -f x64 -I./../../libav/ -P.\..\..\libs\libav\config_x64\config.asm</YasmCommand>
<YasmCommand>yasm.exe -f x64 -I./../../libav/ -P.\..\..\libs\libav\config_x64\config.asm</YasmCommand>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">