Changeset 5267 for pjproject


Ignore:
Timestamp:
Mar 18, 2016 7:42:09 AM (9 years ago)
Author:
riza
Message:

Re #1907: Updated VS2015 build settings, added the new files audio/videodev.h/c.

Location:
pjproject/trunk/pjmedia/build
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • pjproject/trunk/pjmedia/build/pjmedia.vcxproj

    r5168 r5267  
    131131  <ImportGroup Label="ExtensionSettings"> 
    132132  </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" />     
     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" /> 
    137137  </ImportGroup> 
    138138  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets"> 
    139139    <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" />     
     140    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     141    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
    142142  </ImportGroup> 
    143143  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets"> 
    144144    <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" />     
     145    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     146    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    147147  </ImportGroup> 
    148148  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets"> 
    149149    <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" />     
     150    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     151    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    152152  </ImportGroup> 
    153153  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> 
    154154    <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" />     
     155    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     156    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    157157  </ImportGroup> 
    158158  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> 
    159159    <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" />     
     160    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     161    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    162162  </ImportGroup> 
    163163  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets"> 
    164164    <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" />     
     165    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
     166    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
    167167  </ImportGroup> 
    168168  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets"> 
    169169    <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" />     
     170    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
     171    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
    172172  </ImportGroup> 
    173173  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets"> 
    174174    <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" />     
     175    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
     176    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    177177  </ImportGroup> 
    178178  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets"> 
    179179    <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" />     
     180    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
     181    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    182182  </ImportGroup> 
    183183  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> 
    184184    <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" />     
     185    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
     186    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    187187  </ImportGroup> 
    188188  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> 
    189189    <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" />     
     190    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
     191    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    192192  </ImportGroup> 
    193193  <PropertyGroup Label="UserMacros" /> 
    … …  
    303303    <ClCompile Include="..\src\pjmedia\alaw_ulaw.c" /> 
    304304    <ClCompile Include="..\src\pjmedia\alaw_ulaw_table.c" /> 
     305    <ClCompile Include="..\src\pjmedia\audiodev.c" /> 
    305306    <ClCompile Include="..\src\pjmedia\avi_player.c" /> 
    306307    <ClCompile Include="..\src\pjmedia\bidirectional.c" /> 
    … …  
    355356    <ClCompile Include="..\src\pjmedia\transport_udp.c" /> 
    356357    <ClCompile Include="..\src\pjmedia\types.c" /> 
     358    <ClCompile Include="..\src\pjmedia\videodev.c" /> 
    357359    <ClCompile Include="..\src\pjmedia\vid_codec.c" /> 
    358360    <ClCompile Include="..\src\pjmedia\vid_codec_util.c" /> 
    … …  
    370372    <ClInclude Include="..\include\pjmedia.h" /> 
    371373    <ClInclude Include="..\include\pjmedia\alaw_ulaw.h" /> 
     374    <ClInclude Include="..\include\pjmedia\audiodev.h" /> 
    372375    <ClInclude Include="..\include\pjmedia\avi.h" /> 
    373376    <ClInclude Include="..\include\pjmedia\avi_stream.h" /> 
    … …  
    417420    <ClInclude Include="..\include\pjmedia\transport_udp.h" /> 
    418421    <ClInclude Include="..\include\pjmedia\types.h" /> 
     422    <ClInclude Include="..\include\pjmedia\videodev.h" /> 
    419423    <ClInclude Include="..\include\pjmedia\vid_codec.h" /> 
    420424    <ClInclude Include="..\include\pjmedia\vid_codec_util.h" /> 

  • pjproject/trunk/pjmedia/build/pjmedia.vcxproj.filters

    r5181 r5267  
    207207      <Filter>Source Files</Filter> 
    208208    </ClCompile> 
     209    <ClCompile Include="..\src\pjmedia\audiodev.c"> 
     210      <Filter>Source Files</Filter> 
     211    </ClCompile> 
     212    <ClCompile Include="..\src\pjmedia\videodev.c"> 
     213      <Filter>Source Files</Filter> 
     214    </ClCompile> 
    209215  </ItemGroup> 
    210216  <ItemGroup> 
    … …  
    383389      <Filter>Header Files</Filter> 
    384390    </ClInclude> 
     391    <ClInclude Include="..\include\pjmedia\audiodev.h"> 
     392      <Filter>Header Files</Filter> 
     393    </ClInclude> 
     394    <ClInclude Include="..\include\pjmedia\videodev.h"> 
     395      <Filter>Header Files</Filter> 
     396    </ClInclude> 
    385397  </ItemGroup> 
    386398</Project> 
Note: See TracChangeset for help on using the changeset viewer.