From 3a6803cbacbbbd4d44e102beddea3221920ad419 Mon Sep 17 00:00:00 2001 From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com> Date: Fri, 15 Nov 2019 11:34:02 -0500 Subject: [PATCH] contrib: force unicode charset build flag in portaudio vcxproj Change-Id: I2672a4eb868183b84620bc46d814cf48870707fc --- contrib/src/portaudio/pa-vs2017.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/contrib/src/portaudio/pa-vs2017.patch b/contrib/src/portaudio/pa-vs2017.patch index a4bf0a11f4..f03c27b66f 100644 --- a/contrib/src/portaudio/pa-vs2017.patch +++ b/contrib/src/portaudio/pa-vs2017.patch @@ -24,28 +24,28 @@ + <PropertyGroup Label="Globals"> + <ProjectGuid>{0A18A071-125E-442F-AFF7-A3F68ABECF99}</ProjectGuid> + <RootNamespace>portaudio</RootNamespace> -+ <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> ++ <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> -+ <PlatformToolset>v141</PlatformToolset> -+ <UseOfMfc>false</UseOfMfc> ++ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc><CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> -+ <PlatformToolset>v141</PlatformToolset> -+ <UseOfMfc>false</UseOfMfc> ++ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc><CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> -+ <PlatformToolset>v141</PlatformToolset> -+ <UseOfMfc>false</UseOfMfc> ++ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc><CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> -+ <PlatformToolset>v141</PlatformToolset> -+ <UseOfMfc>false</UseOfMfc> ++ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc><CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> -- GitLab