diff options
author | David Ostrovsky <david@ostrovsky.org> | 2017-03-04 14:36:08 +0100 |
---|---|---|
committer | David Ostrovsky <david@ostrovsky.org> | 2017-04-21 18:18:44 +0200 |
commit | de030cd7a234fd9191364647deb1a4836ca992cb (patch) | |
tree | 8ac04e8ec53eb01b15bde0d0b079602feafbb1d9 /external/coinmp | |
parent | 489414f2395b6c8008ebcda7c37a150fd4ed7ad5 (diff) |
gbuild: Remove MSVC 2013 legacy code
Uwinapi is discontinued.
Change-Id: I063b4d0d8fab2d60de168e960a63b8181158ac01
Reviewed-on: https://gerrit.libreoffice.org/23198
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: David Ostrovsky <david@ostrovsky.org>
Diffstat (limited to 'external/coinmp')
-rw-r--r-- | external/coinmp/UnpackedTarball_coinmp.mk | 4 | ||||
-rw-r--r-- | external/coinmp/coinmp-vs2013.patch.1 | 352 |
2 files changed, 1 insertions, 355 deletions
diff --git a/external/coinmp/UnpackedTarball_coinmp.mk b/external/coinmp/UnpackedTarball_coinmp.mk index 98d544034ff4..0bf3f8cfb60b 100644 --- a/external/coinmp/UnpackedTarball_coinmp.mk +++ b/external/coinmp/UnpackedTarball_coinmp.mk @@ -24,9 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\ external/coinmp/werror-format-security.patch.0 \ external/coinmp/werror-undef.patch.0 \ external/coinmp/coinmp-msvc-disable-sse2.patch.1 \ - $(if $(filter MSC,$(COM)),external/coinmp/windows.build.patch.1 \ - $(if $(filter 120,$(VCVER)),external/coinmp/coinmp-vs2013.patch.1) \ - ) \ + $(if $(filter MSC,$(COM)),external/coinmp/windows.build.patch.1) \ $(if $(filter MACOSX,$(OS)),external/coinmp/macosx.build.patch.1) \ external/coinmp/werror-format-pedantic.patch.0 \ external/coinmp/ubsan.patch.0 \ diff --git a/external/coinmp/coinmp-vs2013.patch.1 b/external/coinmp/coinmp-vs2013.patch.1 deleted file mode 100644 index 2b06c1519a78..000000000000 --- a/external/coinmp/coinmp-vs2013.patch.1 +++ /dev/null @@ -1,352 +0,0 @@ --*- Mode:Diff -*- ---- coinmp/Cbc/MSVisualStudio/v9/libCbc/libCbc.vcxproj -+++ coinmp/Cbc/MSVisualStudio/v9/libCbc/libCbc.vcxproj -@@ -1,5 +1,5 @@ - <?xml version="1.0" encoding="utf-8"?> --<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> -@@ -25,25 +25,25 @@ - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> ---- coinmp/Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcxproj -+++ coinmp/Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcxproj -@@ -1,5 +1,5 @@ - <?xml version="1.0" encoding="utf-8"?> --<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> -@@ -26,27 +26,27 @@ - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - <CLRSupport>false</CLRSupport> - <WholeProgramOptimization>false</WholeProgramOptimization> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - <CLRSupport>false</CLRSupport> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - <CLRSupport>false</CLRSupport> - <WholeProgramOptimization>false</WholeProgramOptimization> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - <CLRSupport>false</CLRSupport> - </PropertyGroup> ---- coinmp/Cgl/MSVisualStudio/v9/libCgl/libCgl.vcxproj -+++ coinmp/Cgl/MSVisualStudio/v9/libCgl/libCgl.vcxproj -@@ -1,5 +1,5 @@ - <?xml version="1.0" encoding="utf-8"?> --<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> -@@ -25,25 +25,25 @@ - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> ---- coinmp/Clp/MSVisualStudio/v9/libClp/libClp.vcxproj -+++ coinmp/Clp/MSVisualStudio/v9/libClp/libClp.vcxproj -@@ -1,5 +1,5 @@ - <?xml version="1.0" encoding="utf-8"?> --<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> -@@ -25,25 +25,25 @@ - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> ---- coinmp/Clp/MSVisualStudio/v9/libOsiClp/libOsiClp.vcxproj -+++ coinmp/Clp/MSVisualStudio/v9/libOsiClp/libOsiClp.vcxproj -@@ -1,5 +1,5 @@ - <?xml version="1.0" encoding="utf-8"?> --<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> -@@ -25,25 +25,25 @@ - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> ---- coinmp/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.vcxproj -+++ coinmp/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.vcxproj -@@ -1,5 +1,5 @@ - <?xml version="1.0" encoding="utf-8"?> --<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> -@@ -26,24 +26,24 @@ - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> ---- coinmp/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj -+++ coinmp/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj -@@ -1,5 +1,5 @@ - <?xml version="1.0" encoding="utf-8"?> --<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> -@@ -26,24 +26,24 @@ - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> ---- coinmp/CoinUtils/MSVisualStudio/v9/libCoinUtils/libCoinUtils.vcxproj -+++ coinmp/CoinUtils/MSVisualStudio/v9/libCoinUtils/libCoinUtils.vcxproj -@@ -1,5 +1,5 @@ - <?xml version="1.0" encoding="utf-8"?> --<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> -@@ -25,25 +25,25 @@ - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> ---- coinmp/Osi/MSVisualStudio/v9/libOsi/libOsi.vcxproj -+++ coinmp/Osi/MSVisualStudio/v9/libOsi/libOsi.vcxproj -@@ -1,5 +1,5 @@ - <?xml version="1.0" encoding="utf-8"?> --<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> -@@ -24,25 +24,25 @@ - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> -- <PlatformToolset>v110</PlatformToolset> -+ <PlatformToolset>v120</PlatformToolset> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> |