Ignore:
Timestamp:
Jan 23, 2017 4:32:34 AM (8 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/pjlib/build/pjlib_test.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>{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}</ProjectGuid> 
    55     <RootNamespace>pjlib_test</RootNamespace> 
     81    <RootNamespace>pjlib_test</RootNamespace>     
     82    <!-- Specific UWP property --> 
     83    <DefaultLanguage>en-US</DefaultLanguage> 
    5684  </PropertyGroup> 
    5785  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 
    … …  
    6290    <CharacterSet>MultiByte</CharacterSet> 
    6391  </PropertyGroup> 
     92  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="Configuration"> 
     93    <ConfigurationType>Application</ConfigurationType> 
     94    <PlatformToolset>v140</PlatformToolset> 
     95    <UseOfMfc>false</UseOfMfc> 
     96    <CharacterSet>MultiByte</CharacterSet> 
     97  </PropertyGroup> 
    6498  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="Configuration"> 
    6599    <ConfigurationType>Application</ConfigurationType> 
    … …  
    68102    <CharacterSet>MultiByte</CharacterSet> 
    69103  </PropertyGroup> 
     104  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="Configuration"> 
     105    <ConfigurationType>Application</ConfigurationType> 
     106    <PlatformToolset>v140</PlatformToolset> 
     107    <UseOfMfc>false</UseOfMfc> 
     108    <CharacterSet>MultiByte</CharacterSet> 
     109  </PropertyGroup> 
    70110  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="Configuration"> 
    71111    <ConfigurationType>Application</ConfigurationType> 
    … …  
    74114    <CharacterSet>MultiByte</CharacterSet> 
    75115  </PropertyGroup> 
     116  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="Configuration"> 
     117    <ConfigurationType>Application</ConfigurationType> 
     118    <PlatformToolset>v140</PlatformToolset> 
     119    <UseOfMfc>false</UseOfMfc> 
     120    <CharacterSet>MultiByte</CharacterSet> 
     121  </PropertyGroup> 
    76122  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="Configuration"> 
    77123    <ConfigurationType>Application</ConfigurationType> 
    … …  
    80126    <CharacterSet>MultiByte</CharacterSet> 
    81127  </PropertyGroup> 
     128  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="Configuration"> 
     129    <ConfigurationType>Application</ConfigurationType> 
     130    <PlatformToolset>v140</PlatformToolset> 
     131    <UseOfMfc>false</UseOfMfc> 
     132    <CharacterSet>MultiByte</CharacterSet> 
     133  </PropertyGroup> 
    82134  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 
    83135    <ConfigurationType>Application</ConfigurationType> 
    … …  
    86138    <CharacterSet>MultiByte</CharacterSet> 
    87139  </PropertyGroup> 
     140  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> 
     141    <ConfigurationType>Application</ConfigurationType> 
     142    <PlatformToolset>v140</PlatformToolset> 
     143    <UseOfMfc>false</UseOfMfc> 
     144    <CharacterSet>MultiByte</CharacterSet> 
     145  </PropertyGroup> 
    88146  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 
    89147    <ConfigurationType>Application</ConfigurationType> 
    … …  
    92150    <CharacterSet>MultiByte</CharacterSet> 
    93151  </PropertyGroup> 
     152  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> 
     153    <ConfigurationType>Application</ConfigurationType> 
     154    <PlatformToolset>v140</PlatformToolset> 
     155    <UseOfMfc>false</UseOfMfc> 
     156    <CharacterSet>MultiByte</CharacterSet> 
     157  </PropertyGroup> 
    94158  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration"> 
    95159    <ConfigurationType>Application</ConfigurationType> 
    … …  
    127191    <UseOfMfc>false</UseOfMfc> 
    128192    <CharacterSet>MultiByte</CharacterSet> 
     193  </PropertyGroup> 
     194  <!-- Override the PlatformToolset --> 
     195  <PropertyGroup> 
     196    <PlatformToolset>$(BuildToolset)</PlatformToolset> 
     197    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"> 
     198    </CharacterSet> 
     199    <ConfigurationType Condition="'$(API_Family)'=='WinDesktop'">Application</ConfigurationType> 
     200    <ConfigurationType Condition="'$(API_Family)'=='UWP' Or '$(API_Family)'=='WinPhone8'">StaticLibrary</ConfigurationType> 
    129201  </PropertyGroup> 
    130202  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 
    131203  <ImportGroup Label="ExtensionSettings"> 
    132204  </ImportGroup> 
    133 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets"> 
    134     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    135         <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
    136     <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />     
     205  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets"> 
     206    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     207    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     208    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
     209  </ImportGroup> 
     210  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="PropertySheets"> 
     211    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     212    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     213    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
    137214  </ImportGroup> 
    138215  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets"> 
    139216    <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-common-defaults.props" /> 
    141     <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />     
     217    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     218    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
     219  </ImportGroup> 
     220  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="PropertySheets"> 
     221    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     222    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     223    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
    142224  </ImportGroup> 
    143225  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets"> 
    144226    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    145         <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
    146     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />     
     227    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     228    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
     229  </ImportGroup> 
     230  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="PropertySheets"> 
     231    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     232    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     233    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    147234  </ImportGroup> 
    148235  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets"> 
    149236    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    150         <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
    151     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />     
     237    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     238    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
     239  </ImportGroup> 
     240  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="PropertySheets"> 
     241    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     242    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     243    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    152244  </ImportGroup> 
    153245  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> 
    154246    <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-release-defaults.props" /> 
    156     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />     
     247    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     248    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
     249  </ImportGroup> 
     250  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets"> 
     251    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     252    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     253    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    157254  </ImportGroup> 
    158255  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> 
    159256    <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-common-defaults.props" /> 
    161     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />     
     257    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     258    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
     259  </ImportGroup> 
     260  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets"> 
     261    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     262    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     263    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    162264  </ImportGroup> 
    163265  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets"> 
    164266    <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" />     
     267    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
     268    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
    167269  </ImportGroup> 
    168270  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets"> 
    169271    <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-common-defaults.props" /> 
    171     <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />     
     272    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
     273    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
    172274  </ImportGroup> 
    173275  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets"> 
    174276    <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-release-defaults.props" /> 
    176     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />     
     277    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
     278    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    177279  </ImportGroup> 
    178280  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets"> 
    179281    <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-static-defaults.props" />     
     282    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
     283    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    182284  </ImportGroup> 
    183285  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> 
    184286    <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-release-defaults.props" /> 
    186     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />     
     287    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
     288    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    187289  </ImportGroup> 
    188290  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> 
    189291    <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-common-defaults.props" /> 
    191     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />     
     292    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
     293    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    192294  </ImportGroup> 
    193295  <PropertyGroup Label="UserMacros" /> 
    194296  <PropertyGroup> 
    195297    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> 
    196         <TargetName>pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 
    197   </PropertyGroup> 
     298    <TargetName>pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 
     299  </PropertyGroup> 
     300  <!-- Compile and link option definition --> 
     301  <ItemDefinitionGroup> 
     302    <ClCompile> 
     303      <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary> 
     304    </ClCompile> 
     305    <Lib> 
     306      <OutputFile>..\lib\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     307    </Lib> 
     308  </ItemDefinitionGroup> 
    198309  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 
    199310    <ClCompile> 
    … …  
    201312      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    202313      <PrecompiledHeaderOutputFile /> 
     314    </ClCompile> 
     315    <Link> 
     316      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
     317      <OutputFile>..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     318    </Link> 
     319  </ItemDefinitionGroup> 
     320  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> 
     321    <ClCompile> 
     322      <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     323      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     324      <PrecompiledHeaderOutputFile> 
     325      </PrecompiledHeaderOutputFile> 
    203326    </ClCompile> 
    204327    <Link> 
    … …  
    234357    </Link> 
    235358  </ItemDefinitionGroup> 
     359  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> 
     360    <ClCompile> 
     361      <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     362      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     363      <PrecompiledHeaderOutputFile> 
     364      </PrecompiledHeaderOutputFile> 
     365    </ClCompile> 
     366    <Link> 
     367      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
     368      <OutputFile>..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     369    </Link> 
     370  </ItemDefinitionGroup> 
    236371  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 
    237372    <Midl> 
    … …  
    260395    </Link> 
    261396  </ItemDefinitionGroup> 
     397  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'"> 
     398    <ClCompile> 
     399      <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     400      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     401      <PrecompiledHeaderOutputFile> 
     402      </PrecompiledHeaderOutputFile> 
     403    </ClCompile> 
     404    <Link> 
     405      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
     406      <OutputFile>..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     407    </Link> 
     408  </ItemDefinitionGroup> 
    262409  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'"> 
    263410    <Midl> 
    … …  
    287434    </Link> 
    288435  </ItemDefinitionGroup> 
     436  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'"> 
     437    <ClCompile> 
     438      <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     439      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     440      <PrecompiledHeaderOutputFile> 
     441      </PrecompiledHeaderOutputFile> 
     442    </ClCompile> 
     443    <Link> 
     444      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
     445      <OutputFile>..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     446    </Link> 
     447  </ItemDefinitionGroup> 
    289448  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'"> 
    290449    <Midl> 
    … …  
    313472    </Link> 
    314473  </ItemDefinitionGroup> 
     474  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'"> 
     475    <ClCompile> 
     476      <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     477      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     478      <PrecompiledHeaderOutputFile> 
     479      </PrecompiledHeaderOutputFile> 
     480    </ClCompile> 
     481    <Link> 
     482      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
     483      <OutputFile>..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     484    </Link> 
     485  </ItemDefinitionGroup> 
    315486  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'"> 
    316487    <Midl> 
    … …  
    334505      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    335506      <PrecompiledHeaderOutputFile /> 
     507    </ClCompile> 
     508    <Link> 
     509      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 
     510      <OutputFile>..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 
     511    </Link> 
     512  </ItemDefinitionGroup> 
     513  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'"> 
     514    <ClCompile> 
     515      <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     516      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     517      <PrecompiledHeaderOutputFile> 
     518      </PrecompiledHeaderOutputFile> 
    336519    </ClCompile> 
    337520    <Link> 
    … …  
    369552    <ClCompile Include="..\src\pjlib-test\ioq_unreg.c" /> 
    370553    <ClCompile Include="..\src\pjlib-test\list.c" /> 
    371     <ClCompile Include="..\src\pjlib-test\main.c" /> 
     554    <ClCompile Condition="'$(API_Family)'=='WinDesktop'" Include="..\src\pjlib-test\main.c"> 
     555    </ClCompile> 
    372556    <ClCompile Include="..\src\pjlib-test\main_mod.c"> 
    373557      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 
     558      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 
    374559      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 
    375560      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 
     561      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 
    376562      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 
    377563      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 
     564      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 
    378565      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 
    379566      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 
     567      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 
    380568      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 
    381569      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 
     570      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 
    382571      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 
    383572      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 
     573      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 
    384574      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 
    385575    </ClCompile> 
    386576    <ClCompile Include="..\src\pjlib-test\main_win32.c"> 
    387577      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 
     578      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 
    388579      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 
    389580      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 
     581      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 
    390582      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 
    391583      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 
     584      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 
    392585      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 
    393586      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 
     587      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 
    394588      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 
    395589      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 
     590      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 
    396591      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 
    397592      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 
     593      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 
    398594      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 
    399595    </ClCompile> 
Note: See TracChangeset for help on using the changeset viewer.