diff options
Diffstat (limited to 'pjlib-util/build/pjlib_util_test.vcxproj')
| -rw-r--r-- | pjlib-util/build/pjlib_util_test.vcxproj | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/pjlib-util/build/pjlib_util_test.vcxproj b/pjlib-util/build/pjlib_util_test.vcxproj index cd2c31cb..366adec1 100644 --- a/pjlib-util/build/pjlib_util_test.vcxproj +++ b/pjlib-util/build/pjlib_util_test.vcxproj @@ -50,9 +50,13 @@ <Platform>x64</Platform> </ProjectConfiguration> </ItemGroup> + <!-- Import common config --> + <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" /> <PropertyGroup Label="Globals"> <ProjectGuid>{ED02BE13-8297-4770-8097-27DC2CCABF9A}</ProjectGuid> - <RootNamespace>pjlib_util_test</RootNamespace> + <RootNamespace>pjlib_util_test</RootNamespace> + <!-- Specific UWP property --> + <DefaultLanguage>en-US</DefaultLanguage> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="Configuration"> @@ -127,6 +131,13 @@ <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> + <!-- Override the PlatformToolset --> + <PropertyGroup> + <PlatformToolset>$(BuildToolset)</PlatformToolset> + <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet> + <ConfigurationType Condition="'$(API_Family)'=='WinDesktop'">Application</ConfigurationType> + <ConfigurationType Condition="'$(API_Family)'=='UWP' Or '$(API_Family)'=='WinPhone8'">StaticLibrary</ConfigurationType> + </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> @@ -193,7 +204,16 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup> <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> + <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> </PropertyGroup> + <ItemDefinitionGroup> + <ClCompile> + <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary> + </ClCompile> + <Lib> + <OutputFile>..\lib\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> + </Lib> + </ItemDefinitionGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'"> <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> </PropertyGroup> |