Ignore:
Timestamp:
Jan 23, 2017 4:32:34 AM (7 years ago)
Author:
nanang
Message:

Re #1900: Reintegrated works in UWP branch to trunk.

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • pjproject/trunk

  • pjproject/trunk/third_party/build/g7221/libg7221codec.vcxproj

    r5168 r5539  
    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> 
    … …  
    5175    </ProjectConfiguration> 
    5276  </ItemGroup> 
     77  <!-- Import common config --> 
     78  <Import Project="..\..\..\build\vs\pjproject-vs14-common-config.props" /> 
    5379  <PropertyGroup Label="Globals"> 
    5480    <ProjectGuid>{2A3F241E-682C-47E1-9543-DC28708B406A}</ProjectGuid> 
    5581    <RootNamespace>libg7221codec</RootNamespace> 
     82    <DefaultLanguage>en-US</DefaultLanguage>     
     83    <!-- Specific UWP property --> 
    5684  </PropertyGroup> 
    5785  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 
    … …  
    6088    <PlatformToolset>v140</PlatformToolset> 
    6189    <UseOfMfc>false</UseOfMfc> 
    62     <CharacterSet>MultiByte</CharacterSet> 
     90  </PropertyGroup> 
     91  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="Configuration"> 
     92    <ConfigurationType>StaticLibrary</ConfigurationType> 
     93    <PlatformToolset>v140</PlatformToolset> 
     94    <UseOfMfc>false</UseOfMfc> 
    6395  </PropertyGroup> 
    6496  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="Configuration"> 
    … …  
    6698    <PlatformToolset>v140</PlatformToolset> 
    6799    <UseOfMfc>false</UseOfMfc> 
    68     <CharacterSet>MultiByte</CharacterSet> 
     100  </PropertyGroup> 
     101  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="Configuration"> 
     102    <ConfigurationType>StaticLibrary</ConfigurationType> 
     103    <PlatformToolset>v140</PlatformToolset> 
     104    <UseOfMfc>false</UseOfMfc> 
    69105  </PropertyGroup> 
    70106  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="Configuration"> 
    … …  
    72108    <PlatformToolset>v140</PlatformToolset> 
    73109    <UseOfMfc>false</UseOfMfc> 
    74     <CharacterSet>MultiByte</CharacterSet> 
     110  </PropertyGroup> 
     111  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="Configuration"> 
     112    <ConfigurationType>StaticLibrary</ConfigurationType> 
     113    <PlatformToolset>v140</PlatformToolset> 
     114    <UseOfMfc>false</UseOfMfc> 
    75115  </PropertyGroup> 
    76116  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="Configuration"> 
    … …  
    78118    <PlatformToolset>v140</PlatformToolset> 
    79119    <UseOfMfc>false</UseOfMfc> 
    80     <CharacterSet>MultiByte</CharacterSet> 
     120  </PropertyGroup> 
     121  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="Configuration"> 
     122    <ConfigurationType>StaticLibrary</ConfigurationType> 
     123    <PlatformToolset>v140</PlatformToolset> 
     124    <UseOfMfc>false</UseOfMfc> 
    81125  </PropertyGroup> 
    82126  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 
    … …  
    84128    <PlatformToolset>v140</PlatformToolset> 
    85129    <UseOfMfc>false</UseOfMfc> 
    86     <CharacterSet>MultiByte</CharacterSet> 
     130  </PropertyGroup> 
     131  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> 
     132    <ConfigurationType>StaticLibrary</ConfigurationType> 
     133    <PlatformToolset>v140</PlatformToolset> 
     134    <UseOfMfc>false</UseOfMfc> 
    87135  </PropertyGroup> 
    88136  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 
    … …  
    90138    <PlatformToolset>v140</PlatformToolset> 
    91139    <UseOfMfc>false</UseOfMfc> 
    92     <CharacterSet>MultiByte</CharacterSet> 
     140  </PropertyGroup> 
     141  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> 
     142    <ConfigurationType>StaticLibrary</ConfigurationType> 
     143    <PlatformToolset>v140</PlatformToolset> 
     144    <UseOfMfc>false</UseOfMfc> 
    93145  </PropertyGroup> 
    94146  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration"> 
    … …  
    96148    <PlatformToolset>v140</PlatformToolset> 
    97149    <UseOfMfc>false</UseOfMfc> 
    98     <CharacterSet>MultiByte</CharacterSet> 
    99150  </PropertyGroup> 
    100151  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration"> 
    … …  
    102153    <PlatformToolset>v140</PlatformToolset> 
    103154    <UseOfMfc>false</UseOfMfc> 
    104     <CharacterSet>MultiByte</CharacterSet> 
    105155  </PropertyGroup> 
    106156  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration"> 
    … …  
    108158    <PlatformToolset>v140</PlatformToolset> 
    109159    <UseOfMfc>false</UseOfMfc> 
    110     <CharacterSet>MultiByte</CharacterSet> 
    111160  </PropertyGroup> 
    112161  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration"> 
    … …  
    114163    <PlatformToolset>v140</PlatformToolset> 
    115164    <UseOfMfc>false</UseOfMfc> 
    116     <CharacterSet>MultiByte</CharacterSet> 
    117165  </PropertyGroup> 
    118166  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 
    … …  
    120168    <PlatformToolset>v140</PlatformToolset> 
    121169    <UseOfMfc>false</UseOfMfc> 
    122     <CharacterSet>MultiByte</CharacterSet> 
    123170  </PropertyGroup> 
    124171  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 
    … …  
    126173    <PlatformToolset>v140</PlatformToolset> 
    127174    <UseOfMfc>false</UseOfMfc> 
    128     <CharacterSet>MultiByte</CharacterSet> 
     175  </PropertyGroup> 
     176  <!-- Override the PlatformToolset --> 
     177  <PropertyGroup> 
     178    <PlatformToolset>$(BuildToolset)</PlatformToolset><CharacterSet Condition="'$(API_Family)'=='WinDesktop'">MultiByte</CharacterSet> 
     179    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet> 
    129180  </PropertyGroup> 
    130181  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 
    … …  
    136187    <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
    137188  </ImportGroup> 
     189  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="PropertySheets"> 
     190    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     191    <Import Project="..\..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 
     192    <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
     193  </ImportGroup> 
    138194  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets"> 
    139195    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    140         <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
    141     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />     
     196    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     197    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
     198  </ImportGroup> 
     199  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="PropertySheets"> 
     200    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     201    <Import Project="..\..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 
     202    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    142203  </ImportGroup> 
    143204  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> 
    … …  
    146207    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    147208  </ImportGroup> 
     209  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets"> 
     210    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     211    <Import Project="..\..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 
     212    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
     213  </ImportGroup> 
    148214  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets"> 
    149215    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    … …  
    151217    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
    152218  </ImportGroup> 
     219  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="PropertySheets"> 
     220    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     221    <Import Project="..\..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 
     222    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
     223  </ImportGroup> 
    153224  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets"> 
    154225    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    155         <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
    156     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />     
     226    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     227    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
     228  </ImportGroup> 
     229  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="PropertySheets"> 
     230    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     231    <Import Project="..\..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 
     232    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    157233  </ImportGroup> 
    158234  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> 
    159235    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    160         <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
    161     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />     
     236    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     237    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
     238  </ImportGroup> 
     239  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets"> 
     240    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     241    <Import Project="..\..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 
     242    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    162243  </ImportGroup> 
    163244  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets"> 
    164245    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    165         <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />    
    166         <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
     246    <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
     247    <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
    167248  </ImportGroup> 
    168249  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets"> 
    169250    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    170         <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
    171     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />     
     251    <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
     252    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    172253  </ImportGroup> 
    173254  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> 
    174255    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    175         <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
    176     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />     
     256    <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
     257    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    177258  </ImportGroup> 
    178259  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets"> 
    179260    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    180         <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
    181     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />     
     261    <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
     262    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
    182263  </ImportGroup> 
    183264  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets"> 
    184265    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    185         <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
    186     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />     
     266    <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
     267    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    187268  </ImportGroup> 
    188269  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> 
    189270    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    190         <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
    191     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />     
     271    <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
     272    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    192273  </ImportGroup> 
    193274  <PropertyGroup Label="UserMacros" /> 
    194275  <PropertyGroup> 
    195276    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> 
    196         <OutDir>..\..\lib\</OutDir> 
    197   </PropertyGroup> 
     277    <OutDir>..\..\lib\</OutDir> 
     278  </PropertyGroup> 
     279  <!-- Compile and link option definition --> 
     280  <ItemDefinitionGroup> 
     281    <ClCompile> 
     282      <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary> 
     283    </ClCompile> 
     284  </ItemDefinitionGroup> 
    198285  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 
    199286    <ClCompile> 
    … …  
    201288      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    202289      <PrecompiledHeaderOutputFile /> 
     290    </ClCompile> 
     291    <Lib> 
     292      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     293    </Lib> 
     294  </ItemDefinitionGroup> 
     295  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> 
     296    <ClCompile> 
     297      <AdditionalIncludeDirectories>../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     298      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     299      <PrecompiledHeaderOutputFile> 
     300      </PrecompiledHeaderOutputFile> 
    203301    </ClCompile> 
    204302    <Lib> 
    … …  
    229327    </Lib> 
    230328  </ItemDefinitionGroup> 
     329  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> 
     330    <ClCompile> 
     331      <AdditionalIncludeDirectories>../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     332      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     333      <PrecompiledHeaderOutputFile> 
     334      </PrecompiledHeaderOutputFile> 
     335    </ClCompile> 
     336    <Lib> 
     337      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     338    </Lib> 
     339  </ItemDefinitionGroup> 
    231340  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 
    232341    <Midl> 
    … …  
    253362    </Lib> 
    254363  </ItemDefinitionGroup> 
     364  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'"> 
     365    <ClCompile> 
     366      <AdditionalIncludeDirectories>../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     367      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     368      <PrecompiledHeaderOutputFile> 
     369      </PrecompiledHeaderOutputFile> 
     370    </ClCompile> 
     371    <Lib> 
     372      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     373    </Lib> 
     374  </ItemDefinitionGroup> 
    255375  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'"> 
    256376    <Midl> 
    … …  
    277397    </Lib> 
    278398  </ItemDefinitionGroup> 
     399  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'"> 
     400    <ClCompile> 
     401      <AdditionalIncludeDirectories>../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     402      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     403      <PrecompiledHeaderOutputFile> 
     404      </PrecompiledHeaderOutputFile> 
     405    </ClCompile> 
     406    <Lib> 
     407      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     408    </Lib> 
     409  </ItemDefinitionGroup> 
    279410  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'"> 
    280411    <Midl> 
    … …  
    301432    </Lib> 
    302433  </ItemDefinitionGroup> 
     434  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'"> 
     435    <ClCompile> 
     436      <AdditionalIncludeDirectories>../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     437      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     438      <PrecompiledHeaderOutputFile> 
     439      </PrecompiledHeaderOutputFile> 
     440    </ClCompile> 
     441    <Lib> 
     442      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     443    </Lib> 
     444  </ItemDefinitionGroup> 
    303445  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'"> 
    304446    <Midl> 
    … …  
    319461      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    320462      <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-Dynamic|ARM'"> 
     469    <ClCompile> 
     470      <AdditionalIncludeDirectories>../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     471      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     472      <PrecompiledHeaderOutputFile> 
     473      </PrecompiledHeaderOutputFile> 
    321474    </ClCompile> 
    322475    <Lib> 
Note: See TracChangeset for help on using the changeset viewer.