Ignore:
Timestamp:
Jan 25, 2017 7:52:32 AM (7 years ago)
Author:
riza
Message:

Re #1900: Fixed some build error for UWP arm.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • pjproject/trunk/third_party/build/webrtc/libwebrtc.vcxproj

    r5539 r5547  
    22<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 
    33  <ItemGroup Label="ProjectConfigurations"> 
     4    <ProjectConfiguration Include="Debug-Dynamic|ARM"> 
     5      <Configuration>Debug-Dynamic</Configuration> 
     6      <Platform>ARM</Platform> 
     7    </ProjectConfiguration>       
    48    <ProjectConfiguration Include="Debug-Dynamic|Win32"> 
    59      <Configuration>Debug-Dynamic</Configuration> 
    … …  
    1014      <Platform>x64</Platform> 
    1115    </ProjectConfiguration> 
     16    <ProjectConfiguration Include="Debug-Static|ARM"> 
     17      <Configuration>Debug-Static</Configuration> 
     18      <Platform>ARM</Platform> 
     19    </ProjectConfiguration>       
    1220    <ProjectConfiguration Include="Debug-Static|Win32"> 
    1321      <Configuration>Debug-Static</Configuration> 
    … …  
    1826      <Platform>x64</Platform> 
    1927    </ProjectConfiguration> 
     28    <ProjectConfiguration Include="Debug|ARM"> 
     29      <Configuration>Debug</Configuration> 
     30      <Platform>ARM</Platform> 
     31    </ProjectConfiguration>       
    2032    <ProjectConfiguration Include="Debug|Win32"> 
    2133      <Configuration>Debug</Configuration> 
    … …  
    2638      <Platform>x64</Platform> 
    2739    </ProjectConfiguration> 
     40    <ProjectConfiguration Include="Release-Dynamic|ARM"> 
     41      <Configuration>Release-Dynamic</Configuration> 
     42      <Platform>ARM</Platform> 
     43    </ProjectConfiguration>       
    2844    <ProjectConfiguration Include="Release-Dynamic|Win32"> 
    2945      <Configuration>Release-Dynamic</Configuration> 
    … …  
    3450      <Platform>x64</Platform> 
    3551    </ProjectConfiguration> 
     52    <ProjectConfiguration Include="Release-Static|ARM"> 
     53      <Configuration>Release-Static</Configuration> 
     54      <Platform>ARM</Platform> 
     55    </ProjectConfiguration>       
    3656    <ProjectConfiguration Include="Release-Static|Win32"> 
    3757      <Configuration>Release-Static</Configuration> 
    … …  
    4262      <Platform>x64</Platform> 
    4363    </ProjectConfiguration> 
     64    <ProjectConfiguration Include="Release|ARM"> 
     65      <Configuration>Release</Configuration> 
     66      <Platform>ARM</Platform> 
     67    </ProjectConfiguration>       
    4468    <ProjectConfiguration Include="Release|Win32"> 
    4569      <Configuration>Release</Configuration> 
    … …  
    126150    <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aecm\echo_control_mobile.c" /> 
    127151    <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_core.c" /> 
    128     <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_core_sse2.c" /> 
     152    <ClCompile Condition="$(Platform)!=ARM" Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_core_sse2.c" /> 
    129153    <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_rdft.c" /> 
    130     <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_rdft_sse2.c" /> 
     154    <ClCompile Condition="$(Platform)!=ARM" Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_rdft_sse2.c" /> 
    131155    <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_resampler.c" /> 
    132156    <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\echo_cancellation.c" /> 
    … …  
    185209    <CharacterSet>MultiByte</CharacterSet> 
    186210  </PropertyGroup> 
     211  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="Configuration"> 
     212    <ConfigurationType>StaticLibrary</ConfigurationType> 
     213    <PlatformToolset>v140</PlatformToolset> 
     214    <UseOfMfc>false</UseOfMfc> 
     215    <CharacterSet>MultiByte</CharacterSet> 
     216  </PropertyGroup> 
     217  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="Configuration"> 
     218    <ConfigurationType>StaticLibrary</ConfigurationType> 
     219    <PlatformToolset>v140</PlatformToolset> 
     220    <UseOfMfc>false</UseOfMfc> 
     221  </PropertyGroup> 
     222  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="Configuration"> 
     223    <ConfigurationType>StaticLibrary</ConfigurationType> 
     224    <PlatformToolset>v140</PlatformToolset> 
     225    <UseOfMfc>false</UseOfMfc> 
     226    <CharacterSet>MultiByte</CharacterSet> 
     227  </PropertyGroup> 
     228  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="Configuration"> 
     229    <ConfigurationType>StaticLibrary</ConfigurationType> 
     230    <PlatformToolset>v140</PlatformToolset> 
     231    <UseOfMfc>false</UseOfMfc> 
     232    <CharacterSet>MultiByte</CharacterSet>       
     233  </PropertyGroup> 
     234  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> 
     235    <ConfigurationType>StaticLibrary</ConfigurationType> 
     236    <PlatformToolset>v140</PlatformToolset> 
     237    <UseOfMfc>false</UseOfMfc> 
     238    <CharacterSet>MultiByte</CharacterSet>       
     239  </PropertyGroup> 
     240  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> 
     241    <ConfigurationType>StaticLibrary</ConfigurationType> 
     242    <PlatformToolset>v140</PlatformToolset> 
     243    <UseOfMfc>false</UseOfMfc> 
     244    <CharacterSet>MultiByte</CharacterSet>       
     245  </PropertyGroup>         
    187246  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration"> 
    188247    <ConfigurationType>StaticLibrary</ConfigurationType> 
    … …  
    259318    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    260319  </ImportGroup> 
     320  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="PropertySheets"> 
     321    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     322    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     323    <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
     324  </ImportGroup> 
     325  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="PropertySheets"> 
     326    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     327    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     328    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
     329  </ImportGroup> 
     330  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="PropertySheets"> 
     331    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     332    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     333    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
     334  </ImportGroup> 
     335  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="PropertySheets"> 
     336    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     337    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     338    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
     339  </ImportGroup> 
     340  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets"> 
     341    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     342    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     343    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
     344  </ImportGroup> 
     345  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets"> 
     346    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     347    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     348    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
     349  </ImportGroup>     
    261350  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets"> 
    262351    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    … …  
    365454      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
    366455    </Lib> 
    367   </ItemDefinitionGroup> 
     456  </ItemDefinitionGroup>    
     457  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> 
     458    <ClCompile> 
     459      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> 
     460      <AdditionalIncludeDirectories>.;../../webrtc/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     461      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     462      <PrecompiledHeaderOutputFile /> 
     463    </ClCompile> 
     464    <Lib> 
     465      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     466    </Lib> 
     467  </ItemDefinitionGroup> 
     468  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> 
     469    <ClCompile> 
     470      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> 
     471      <AdditionalIncludeDirectories>.;../../webrtc/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     472      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     473      <PrecompiledHeaderOutputFile /> 
     474    </ClCompile> 
     475    <Lib> 
     476      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     477    </Lib> 
     478  </ItemDefinitionGroup> 
     479  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'"> 
     480    <ClCompile> 
     481      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> 
     482      <AdditionalIncludeDirectories>.;../../webrtc/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     483      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     484      <PrecompiledHeaderOutputFile /> 
     485    </ClCompile> 
     486    <Lib> 
     487      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     488    </Lib> 
     489  </ItemDefinitionGroup> 
     490  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'"> 
     491    <ClCompile> 
     492      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> 
     493      <AdditionalIncludeDirectories>.;../../webrtc/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     494      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     495      <PrecompiledHeaderOutputFile /> 
     496    </ClCompile> 
     497    <Lib> 
     498      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     499    </Lib> 
     500  </ItemDefinitionGroup> 
     501  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'"> 
     502    <ClCompile> 
     503      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> 
     504      <AdditionalIncludeDirectories>.;../../webrtc/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     505      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     506      <PrecompiledHeaderOutputFile /> 
     507    </ClCompile> 
     508    <Lib> 
     509      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     510    </Lib> 
     511  </ItemDefinitionGroup> 
     512  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'"> 
     513    <ClCompile> 
     514      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> 
     515      <AdditionalIncludeDirectories>.;../../webrtc/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     516      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     517      <PrecompiledHeaderOutputFile /> 
     518    </ClCompile> 
     519    <Lib> 
     520      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     521    </Lib> 
     522  </ItemDefinitionGroup>     
    368523  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 
    369524    <Midl> 
Note: See TracChangeset for help on using the changeset viewer.