diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2015-08-25 08:41:17 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2015-08-25 08:41:17 +0000 |
commit | 1b41ed3f7c9361106a585c1fe43d2338ab94cacc (patch) | |
tree | 987f2cd9cb49791f7b2f2b762efb34b653e6e01a /pjlib-util | |
parent | 89c940da20cea4f108a9e13fb7c223f3f8435f73 (diff) |
Re #1881:
- Updated build output naming 'vc8' -> 'vc14' for VS2015.
- Fixed miscelaneous warnings in VS2015 project settings.
- Updated SVN ignore property.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5169 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib-util')
-rw-r--r-- | pjlib-util/build/pjlib_util_test.vcxproj | 87 |
1 files changed, 62 insertions, 25 deletions
diff --git a/pjlib-util/build/pjlib_util_test.vcxproj b/pjlib-util/build/pjlib_util_test.vcxproj index 2b322561..dc8f0f0e 100644 --- a/pjlib-util/build/pjlib_util_test.vcxproj +++ b/pjlib-util/build/pjlib_util_test.vcxproj @@ -53,6 +53,7 @@ <PropertyGroup Label="Globals"> <ProjectGuid>{ED02BE13-8297-4770-8097-27DC2CCABF9A}</ProjectGuid> <RootNamespace>pjlib_util_test</RootNamespace> + <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="Configuration"> @@ -130,70 +131,106 @@ <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> <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'"> + <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'"> + <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'"> + <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'"> + <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'"> + <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'"> + <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'"> + <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'"> + <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |