Ignore:
Timestamp:
Jan 25, 2017 7:52:32 AM (8 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/yuv/libyuv.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> 
    … …  
    96120    <CharacterSet>MultiByte</CharacterSet> 
    97121  </PropertyGroup> 
     122  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="Configuration"> 
     123    <ConfigurationType>StaticLibrary</ConfigurationType> 
     124    <PlatformToolset>v140</PlatformToolset> 
     125    <UseOfMfc>false</UseOfMfc> 
     126    <CharacterSet>MultiByte</CharacterSet> 
     127  </PropertyGroup> 
     128  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="Configuration"> 
     129    <ConfigurationType>StaticLibrary</ConfigurationType> 
     130    <PlatformToolset>v140</PlatformToolset> 
     131    <UseOfMfc>false</UseOfMfc> 
     132  </PropertyGroup> 
     133  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="Configuration"> 
     134    <ConfigurationType>StaticLibrary</ConfigurationType> 
     135    <PlatformToolset>v140</PlatformToolset> 
     136    <UseOfMfc>false</UseOfMfc> 
     137    <CharacterSet>MultiByte</CharacterSet> 
     138  </PropertyGroup> 
     139  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="Configuration"> 
     140    <ConfigurationType>StaticLibrary</ConfigurationType> 
     141    <PlatformToolset>v140</PlatformToolset> 
     142    <UseOfMfc>false</UseOfMfc> 
     143    <CharacterSet>MultiByte</CharacterSet>       
     144  </PropertyGroup> 
     145  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> 
     146    <ConfigurationType>StaticLibrary</ConfigurationType> 
     147    <PlatformToolset>v140</PlatformToolset> 
     148    <UseOfMfc>false</UseOfMfc> 
     149    <CharacterSet>MultiByte</CharacterSet>       
     150  </PropertyGroup> 
     151  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> 
     152    <ConfigurationType>StaticLibrary</ConfigurationType> 
     153    <PlatformToolset>v140</PlatformToolset> 
     154    <UseOfMfc>false</UseOfMfc> 
     155    <CharacterSet>MultiByte</CharacterSet>       
     156  </PropertyGroup>      
    98157  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration"> 
    99158    <ConfigurationType>StaticLibrary</ConfigurationType> 
    … …  
    171230    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    172231  </ImportGroup> 
     232  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="PropertySheets"> 
     233    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     234    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     235    <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
     236  </ImportGroup> 
     237  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="PropertySheets"> 
     238    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     239    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     240    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
     241  </ImportGroup> 
     242  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="PropertySheets"> 
     243    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     244    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     245    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
     246  </ImportGroup> 
     247  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="PropertySheets"> 
     248    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     249    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     250    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
     251  </ImportGroup> 
     252  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets"> 
     253    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     254    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     255    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
     256  </ImportGroup> 
     257  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets"> 
     258    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     259    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     260    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
     261  </ImportGroup>     
    173262  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets"> 
    174263    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    … …  
    279368    </Lib> 
    280369  </ItemDefinitionGroup> 
     370  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> 
     371    <ClCompile> 
     372      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> 
     373      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     374      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     375      <PrecompiledHeaderOutputFile /> 
     376      <SDLCheck>false</SDLCheck> 
     377    </ClCompile> 
     378    <Lib> 
     379      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     380    </Lib> 
     381  </ItemDefinitionGroup> 
     382  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> 
     383    <ClCompile> 
     384      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> 
     385      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     386      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     387      <PrecompiledHeaderOutputFile /> 
     388    </ClCompile> 
     389    <Lib> 
     390      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     391    </Lib> 
     392  </ItemDefinitionGroup> 
     393  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'"> 
     394    <ClCompile> 
     395      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> 
     396      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     397      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     398      <PrecompiledHeaderOutputFile /> 
     399    </ClCompile> 
     400    <Lib> 
     401      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     402    </Lib> 
     403  </ItemDefinitionGroup> 
     404  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'"> 
     405    <ClCompile> 
     406      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> 
     407      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     408      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     409      <PrecompiledHeaderOutputFile /> 
     410    </ClCompile> 
     411    <Lib> 
     412      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     413    </Lib> 
     414  </ItemDefinitionGroup> 
     415  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'"> 
     416    <ClCompile> 
     417      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> 
     418      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     419      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     420      <PrecompiledHeaderOutputFile /> 
     421    </ClCompile> 
     422    <Lib> 
     423      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     424    </Lib> 
     425  </ItemDefinitionGroup> 
     426  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'"> 
     427    <ClCompile> 
     428      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> 
     429      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     430      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     431      <PrecompiledHeaderOutputFile /> 
     432    </ClCompile> 
     433    <Lib> 
     434      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     435    </Lib> 
     436  </ItemDefinitionGroup>     
    281437  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 
    282438    <Midl> 
Note: See TracChangeset for help on using the changeset viewer.