summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiza Sulistyo <riza@teluu.com>2016-03-18 07:42:09 +0000
committerRiza Sulistyo <riza@teluu.com>2016-03-18 07:42:09 +0000
commit08e8b8225bbc6343053c242fe34e96eb7375dfcc (patch)
tree72f5e43d0af66d9ec26ca98be4c9d1982e44f3a1
parentfa5a50bd39891482fed15beda08e02796bf2029b (diff)
Re #1907: Updated VS2015 build settings, added the new files audio/videodev.h/c.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5267 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r--pjmedia/build/pjmedia.vcxproj54
-rw-r--r--pjmedia/build/pjmedia.vcxproj.filters12
2 files changed, 41 insertions, 25 deletions
diff --git a/pjmedia/build/pjmedia.vcxproj b/pjmedia/build/pjmedia.vcxproj
index 44724987..94f1c5bb 100644
--- a/pjmedia/build/pjmedia.vcxproj
+++ b/pjmedia/build/pjmedia.vcxproj
@@ -130,65 +130,65 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
-<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
- <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
- <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
- <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
- <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
- <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
- <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
- <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
- <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
- <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
- <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
- <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
- <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -302,6 +302,7 @@
<ItemGroup>
<ClCompile Include="..\src\pjmedia\alaw_ulaw.c" />
<ClCompile Include="..\src\pjmedia\alaw_ulaw_table.c" />
+ <ClCompile Include="..\src\pjmedia\audiodev.c" />
<ClCompile Include="..\src\pjmedia\avi_player.c" />
<ClCompile Include="..\src\pjmedia\bidirectional.c" />
<ClCompile Include="..\src\pjmedia\clock_thread.c" />
@@ -354,6 +355,7 @@
<ClCompile Include="..\src\pjmedia\transport_srtp.c" />
<ClCompile Include="..\src\pjmedia\transport_udp.c" />
<ClCompile Include="..\src\pjmedia\types.c" />
+ <ClCompile Include="..\src\pjmedia\videodev.c" />
<ClCompile Include="..\src\pjmedia\vid_codec.c" />
<ClCompile Include="..\src\pjmedia\vid_codec_util.c" />
<ClCompile Include="..\src\pjmedia\vid_port.c" />
@@ -369,6 +371,7 @@
<ItemGroup>
<ClInclude Include="..\include\pjmedia.h" />
<ClInclude Include="..\include\pjmedia\alaw_ulaw.h" />
+ <ClInclude Include="..\include\pjmedia\audiodev.h" />
<ClInclude Include="..\include\pjmedia\avi.h" />
<ClInclude Include="..\include\pjmedia\avi_stream.h" />
<ClInclude Include="..\include\pjmedia\bidirectional.h" />
@@ -416,6 +419,7 @@
<ClInclude Include="..\include\pjmedia\transport_srtp.h" />
<ClInclude Include="..\include\pjmedia\transport_udp.h" />
<ClInclude Include="..\include\pjmedia\types.h" />
+ <ClInclude Include="..\include\pjmedia\videodev.h" />
<ClInclude Include="..\include\pjmedia\vid_codec.h" />
<ClInclude Include="..\include\pjmedia\vid_codec_util.h" />
<ClInclude Include="..\include\pjmedia\vid_port.h" />
diff --git a/pjmedia/build/pjmedia.vcxproj.filters b/pjmedia/build/pjmedia.vcxproj.filters
index 4eb1caf2..e12796fb 100644
--- a/pjmedia/build/pjmedia.vcxproj.filters
+++ b/pjmedia/build/pjmedia.vcxproj.filters
@@ -206,6 +206,12 @@
<ClCompile Include="..\src\pjmedia\wsola.c">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\src\pjmedia\audiodev.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjmedia\videodev.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\include\pjmedia\alaw_ulaw.h">
@@ -382,5 +388,11 @@
<ClInclude Include="..\include\pjmedia\wsola.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\include\pjmedia\audiodev.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjmedia\videodev.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
</Project> \ No newline at end of file