Ignore:
Timestamp:
Aug 25, 2015 8:41:17 AM (9 years ago)
Author:
nanang
Message:

Re #1881:

  • Updated build output naming 'vc8' -> 'vc14' for VS2015.
  • Fixed miscelaneous warnings in VS2015 project settings.
  • Updated SVN ignore property.
Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • pjproject/trunk

    • Property svn:ignore

      •  

        old new  
        1818.filters -R 
        1919*.sdf 
         20*.opensdf 
         21.vs 

  • pjproject/trunk/pjlib-util/build/pjlib_util_test.vcxproj

    r5168 r5169  
    5454    <ProjectGuid>{ED02BE13-8297-4770-8097-27DC2CCABF9A}</ProjectGuid> 
    5555    <RootNamespace>pjlib_util_test</RootNamespace> 
     56    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> 
    5657  </PropertyGroup> 
    5758  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 
    … …  
    131132  <ImportGroup Label="ExtensionSettings"> 
    132133  </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" />     
     134  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets"> 
     135    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     136    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     137    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
    137138  </ImportGroup> 
    138139  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets"> 
    139140    <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" />     
     141    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     142    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
    142143  </ImportGroup> 
    143144  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets"> 
    144145    <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" />     
     146    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     147    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    147148  </ImportGroup> 
    148149  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets"> 
    149150    <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" />     
     151    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     152    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    152153  </ImportGroup> 
    153154  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> 
    154155    <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" />     
     156    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     157    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    157158  </ImportGroup> 
    158159  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> 
    159160    <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" />     
     161    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     162    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    162163  </ImportGroup> 
    163164  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets"> 
    164165    <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" />     
     166    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
     167    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
    167168  </ImportGroup> 
    168169  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets"> 
    169170    <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" />     
     171    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
     172    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
    172173  </ImportGroup> 
    173174  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets"> 
    174175    <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" />     
     176    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
     177    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    177178  </ImportGroup> 
    178179  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets"> 
    179180    <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" />     
     181    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
     182    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    182183  </ImportGroup> 
    183184  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> 
    184185    <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" />     
     186    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
     187    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    187188  </ImportGroup> 
    188189  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> 
    189190    <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" />     
     191    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
     192    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    192193  </ImportGroup> 
    193194  <PropertyGroup Label="UserMacros" /> 
    194195  <PropertyGroup> 
    195196    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> 
     197  </PropertyGroup> 
     198  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'"> 
     199    <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 
     200  </PropertyGroup> 
     201  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'"> 
     202    <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 
     203  </PropertyGroup> 
     204  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 
     205    <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 
     206  </PropertyGroup> 
     207  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 
     208    <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 
     209  </PropertyGroup> 
     210  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'"> 
     211    <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 
     212  </PropertyGroup> 
     213  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'"> 
     214    <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 
     215  </PropertyGroup> 
     216  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'"> 
     217    <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 
     218  </PropertyGroup> 
     219  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'"> 
     220    <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 
     221  </PropertyGroup> 
     222  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 
     223    <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 
     224  </PropertyGroup> 
     225  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 
     226    <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 
     227  </PropertyGroup> 
     228  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'"> 
     229    <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 
     230  </PropertyGroup> 
     231  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'"> 
     232    <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 
    196233  </PropertyGroup> 
    197234  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 
Note: See TracChangeset for help on using the changeset viewer.