diff options
author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2018-08-29 14:49:54 +0800 |
---|---|---|
committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2018-08-29 14:54:34 +0800 |
commit | 70559dab327e9e49e7cc375b1040923fbae8e384 (patch) | |
tree | f6236308d40af109ab11a06b890d7628d3b05740 | |
parent | 7652602b4882d3267511a9c7fab76703511f009e (diff) | |
download | glibmm-70559dab327e9e49e7cc375b1040923fbae8e384.tar.gz |
MSVC builds: Require Visual Studio 2015
It was since 2.50.1 when we actually needed C++-11 features beyond what
Visual Studio 2013 supports, so bump the required Visual Studio version
to 2015, so that things will continue to build.
-rw-r--r-- | MSVC_Net2015/compose.vcxproj (renamed from MSVC_Net2013/compose.vcxproj) | 8 | ||||
-rw-r--r-- | MSVC_Net2015/compose.vcxproj.filters (renamed from MSVC_Net2013/compose.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_Net2015/dispatcher.vcxproj (renamed from MSVC_Net2013/dispatcher.vcxproj) | 8 | ||||
-rw-r--r-- | MSVC_Net2015/dispatcher.vcxproj.filters (renamed from MSVC_Net2013/dispatcher.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_Net2015/dispatcher2.vcxproj (renamed from MSVC_Net2013/dispatcher2.vcxproj) | 8 | ||||
-rw-r--r-- | MSVC_Net2015/dispatcher2.vcxproj.filters (renamed from MSVC_Net2013/dispatcher2.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_Net2015/filelist.am (renamed from MSVC_Net2013/filelist.am) | 2 | ||||
-rw-r--r-- | MSVC_Net2015/gendef.vcxproj (renamed from MSVC_Net2013/gendef.vcxproj) | 8 | ||||
-rw-r--r-- | MSVC_Net2015/gendef.vcxproj.filters (renamed from MSVC_Net2013/gendef.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_Net2015/gendef/gendef.cc (renamed from MSVC_Net2013/gendef/gendef.cc) | 0 | ||||
-rw-r--r-- | MSVC_Net2015/giomm.vcxproj (renamed from MSVC_Net2013/giomm.vcxproj) | 8 | ||||
-rw-r--r-- | MSVC_Net2015/giomm.vcxproj.filters (renamed from MSVC_Net2013/giomm.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_Net2015/giomm/giomm.rc.in (renamed from MSVC_Net2013/giomm/giomm.rc.in) | 0 | ||||
-rw-r--r-- | MSVC_Net2015/giomm_simple.vcxproj (renamed from MSVC_Net2013/giomm_simple.vcxproj) | 8 | ||||
-rw-r--r-- | MSVC_Net2015/giomm_simple.vcxproj.filters (renamed from MSVC_Net2013/giomm_simple.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_Net2015/glibmm-build-defines.props (renamed from MSVC_Net2013/glibmm-build-defines.props) | 0 | ||||
-rw-r--r-- | MSVC_Net2015/glibmm-install.props (renamed from MSVC_Net2013/glibmm-install.props) | 0 | ||||
-rw-r--r-- | MSVC_Net2015/glibmm-version-paths.props (renamed from MSVC_Net2013/glibmm-version-paths.props) | 2 | ||||
-rw-r--r-- | MSVC_Net2015/glibmm.sln (renamed from MSVC_Net2013/glibmm.sln) | 4 | ||||
-rw-r--r-- | MSVC_Net2015/glibmm.vcxproj (renamed from MSVC_Net2013/glibmm.vcxproj) | 8 | ||||
-rw-r--r-- | MSVC_Net2015/glibmm.vcxproj.filters (renamed from MSVC_Net2013/glibmm.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_Net2015/glibmm/glibmm.rc.in (renamed from MSVC_Net2013/glibmm/glibmm.rc.in) | 0 | ||||
-rw-r--r-- | MSVC_Net2015/glibmm_value.vcxproj (renamed from MSVC_Net2013/glibmm_value.vcxproj) | 8 | ||||
-rw-r--r-- | MSVC_Net2015/glibmm_value.vcxproj.filters (renamed from MSVC_Net2013/glibmm_value.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_Net2015/install.vcxproj (renamed from MSVC_Net2013/install.vcxproj) | 8 | ||||
-rw-r--r-- | MSVC_Net2015/keyfile.vcxproj (renamed from MSVC_Net2013/keyfile.vcxproj) | 8 | ||||
-rw-r--r-- | MSVC_Net2015/keyfile.vcxproj.filters (renamed from MSVC_Net2013/keyfile.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_Net2015/markup.vcxproj (renamed from MSVC_Net2013/markup.vcxproj) | 8 | ||||
-rw-r--r-- | MSVC_Net2015/markup.vcxproj.filters (renamed from MSVC_Net2013/markup.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_Net2015/options.vcxproj (renamed from MSVC_Net2013/options.vcxproj) | 8 | ||||
-rw-r--r-- | MSVC_Net2015/options.vcxproj.filters (renamed from MSVC_Net2013/options.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_Net2015/properties.vcxproj (renamed from MSVC_Net2013/properties.vcxproj) | 8 | ||||
-rw-r--r-- | MSVC_Net2015/properties.vcxproj.filters (renamed from MSVC_Net2013/properties.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_Net2015/regex.vcxproj (renamed from MSVC_Net2013/regex.vcxproj) | 8 | ||||
-rw-r--r-- | MSVC_Net2015/regex.vcxproj.filters (renamed from MSVC_Net2013/regex.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_Net2015/resolver.vcxproj (renamed from MSVC_Net2013/resolver.vcxproj) | 8 | ||||
-rw-r--r-- | MSVC_Net2015/resolver.vcxproj.filters (renamed from MSVC_Net2013/resolver.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_Net2015/socket-client.vcxproj (renamed from MSVC_Net2013/socket-client.vcxproj) | 8 | ||||
-rw-r--r-- | MSVC_Net2015/socket-client.vcxproj.filters (renamed from MSVC_Net2013/socket-client.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_Net2015/socket-server.vcxproj (renamed from MSVC_Net2013/socket-server.vcxproj) | 8 | ||||
-rw-r--r-- | MSVC_Net2015/socket-server.vcxproj.filters (renamed from MSVC_Net2013/socket-server.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_Net2015/thread.vcxproj (renamed from MSVC_Net2013/thread.vcxproj) | 8 | ||||
-rw-r--r-- | MSVC_Net2015/thread.vcxproj.filters (renamed from MSVC_Net2013/thread.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_Net2015/threadpool.vcxproj (renamed from MSVC_Net2013/threadpool.vcxproj) | 8 | ||||
-rw-r--r-- | MSVC_Net2015/threadpool.vcxproj.filters (renamed from MSVC_Net2013/threadpool.vcxproj.filters) | 0 | ||||
-rw-r--r-- | Makefile.am | 4 | ||||
-rw-r--r-- | README.win32 | 8 | ||||
-rw-r--r-- | configure.ac | 12 |
48 files changed, 92 insertions, 92 deletions
diff --git a/MSVC_Net2013/compose.vcxproj b/MSVC_Net2015/compose.vcxproj index 4775af37..21d7241e 100644 --- a/MSVC_Net2013/compose.vcxproj +++ b/MSVC_Net2015/compose.vcxproj @@ -28,22 +28,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/MSVC_Net2013/compose.vcxproj.filters b/MSVC_Net2015/compose.vcxproj.filters index 252ebc2f..252ebc2f 100644 --- a/MSVC_Net2013/compose.vcxproj.filters +++ b/MSVC_Net2015/compose.vcxproj.filters diff --git a/MSVC_Net2013/dispatcher.vcxproj b/MSVC_Net2015/dispatcher.vcxproj index 6c403c05..94fb2d7f 100644 --- a/MSVC_Net2013/dispatcher.vcxproj +++ b/MSVC_Net2015/dispatcher.vcxproj @@ -28,22 +28,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/MSVC_Net2013/dispatcher.vcxproj.filters b/MSVC_Net2015/dispatcher.vcxproj.filters index c7d81a08..c7d81a08 100644 --- a/MSVC_Net2013/dispatcher.vcxproj.filters +++ b/MSVC_Net2015/dispatcher.vcxproj.filters diff --git a/MSVC_Net2013/dispatcher2.vcxproj b/MSVC_Net2015/dispatcher2.vcxproj index db6a5fd6..ee481a46 100644 --- a/MSVC_Net2013/dispatcher2.vcxproj +++ b/MSVC_Net2015/dispatcher2.vcxproj @@ -27,22 +27,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/MSVC_Net2013/dispatcher2.vcxproj.filters b/MSVC_Net2015/dispatcher2.vcxproj.filters index b53d4e95..b53d4e95 100644 --- a/MSVC_Net2013/dispatcher2.vcxproj.filters +++ b/MSVC_Net2015/dispatcher2.vcxproj.filters diff --git a/MSVC_Net2013/filelist.am b/MSVC_Net2015/filelist.am index a70124a9..32140497 100644 --- a/MSVC_Net2013/filelist.am +++ b/MSVC_Net2015/filelist.am @@ -1,6 +1,6 @@ ## This file is part of glibmm. -msvc_net2013_data = \ +msvc_net2015_data = \ glibmm.sln \ glibmm-build-defines.props \ glibmm-install.props \ diff --git a/MSVC_Net2013/gendef.vcxproj b/MSVC_Net2015/gendef.vcxproj index 62dbcc84..280e9d89 100644 --- a/MSVC_Net2013/gendef.vcxproj +++ b/MSVC_Net2015/gendef.vcxproj @@ -26,22 +26,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/MSVC_Net2013/gendef.vcxproj.filters b/MSVC_Net2015/gendef.vcxproj.filters index d8cb693f..d8cb693f 100644 --- a/MSVC_Net2013/gendef.vcxproj.filters +++ b/MSVC_Net2015/gendef.vcxproj.filters diff --git a/MSVC_Net2013/gendef/gendef.cc b/MSVC_Net2015/gendef/gendef.cc index d18ac9fb..d18ac9fb 100644 --- a/MSVC_Net2013/gendef/gendef.cc +++ b/MSVC_Net2015/gendef/gendef.cc diff --git a/MSVC_Net2013/giomm.vcxproj b/MSVC_Net2015/giomm.vcxproj index bc4fc3d5..6c4b57ab 100644 --- a/MSVC_Net2013/giomm.vcxproj +++ b/MSVC_Net2015/giomm.vcxproj @@ -26,22 +26,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/MSVC_Net2013/giomm.vcxproj.filters b/MSVC_Net2015/giomm.vcxproj.filters index 4f01b13d..4f01b13d 100644 --- a/MSVC_Net2013/giomm.vcxproj.filters +++ b/MSVC_Net2015/giomm.vcxproj.filters diff --git a/MSVC_Net2013/giomm/giomm.rc.in b/MSVC_Net2015/giomm/giomm.rc.in index c2335f89..c2335f89 100644 --- a/MSVC_Net2013/giomm/giomm.rc.in +++ b/MSVC_Net2015/giomm/giomm.rc.in diff --git a/MSVC_Net2013/giomm_simple.vcxproj b/MSVC_Net2015/giomm_simple.vcxproj index 1eb61241..bc7e3fd5 100644 --- a/MSVC_Net2013/giomm_simple.vcxproj +++ b/MSVC_Net2015/giomm_simple.vcxproj @@ -28,22 +28,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/MSVC_Net2013/giomm_simple.vcxproj.filters b/MSVC_Net2015/giomm_simple.vcxproj.filters index 6f87c63f..6f87c63f 100644 --- a/MSVC_Net2013/giomm_simple.vcxproj.filters +++ b/MSVC_Net2015/giomm_simple.vcxproj.filters diff --git a/MSVC_Net2013/glibmm-build-defines.props b/MSVC_Net2015/glibmm-build-defines.props index 5cbde3cf..5cbde3cf 100644 --- a/MSVC_Net2013/glibmm-build-defines.props +++ b/MSVC_Net2015/glibmm-build-defines.props diff --git a/MSVC_Net2013/glibmm-install.props b/MSVC_Net2015/glibmm-install.props index f28a0c86..f28a0c86 100644 --- a/MSVC_Net2013/glibmm-install.props +++ b/MSVC_Net2015/glibmm-install.props diff --git a/MSVC_Net2013/glibmm-version-paths.props b/MSVC_Net2015/glibmm-version-paths.props index 216731ba..48b75a12 100644 --- a/MSVC_Net2013/glibmm-version-paths.props +++ b/MSVC_Net2015/glibmm-version-paths.props @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Label="UserMacros"> - <VSVer>12</VSVer> + <VSVer>14</VSVer> <GlibEtcInstallRoot>$(SolutionDir)\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <CopyDir>$(GlibEtcInstallRoot)</CopyDir> <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)\</DefDir> diff --git a/MSVC_Net2013/glibmm.sln b/MSVC_Net2015/glibmm.sln index d71dbc12..4bc1b442 100644 --- a/MSVC_Net2013/glibmm.sln +++ b/MSVC_Net2015/glibmm.sln @@ -1,5 +1,5 @@ -Microsoft Visual Studio Solution File, Format Version 13.00
-# Visual Studio 2013
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glibmm", "glibmm.vcxproj", "{58B2B53C-C4FF-47FD-817B-095E45B7F7D4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gendef", "gendef.vcxproj", "{07324745-C9BE-4D65-B08A-9C88188C0C28}"
diff --git a/MSVC_Net2013/glibmm.vcxproj b/MSVC_Net2015/glibmm.vcxproj index 6594edca..8d6106b7 100644 --- a/MSVC_Net2013/glibmm.vcxproj +++ b/MSVC_Net2015/glibmm.vcxproj @@ -28,22 +28,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/MSVC_Net2013/glibmm.vcxproj.filters b/MSVC_Net2015/glibmm.vcxproj.filters index 578c253d..578c253d 100644 --- a/MSVC_Net2013/glibmm.vcxproj.filters +++ b/MSVC_Net2015/glibmm.vcxproj.filters diff --git a/MSVC_Net2013/glibmm/glibmm.rc.in b/MSVC_Net2015/glibmm/glibmm.rc.in index 548ac23f..548ac23f 100644 --- a/MSVC_Net2013/glibmm/glibmm.rc.in +++ b/MSVC_Net2015/glibmm/glibmm.rc.in diff --git a/MSVC_Net2013/glibmm_value.vcxproj b/MSVC_Net2015/glibmm_value.vcxproj index 9639003b..90276156 100644 --- a/MSVC_Net2013/glibmm_value.vcxproj +++ b/MSVC_Net2015/glibmm_value.vcxproj @@ -28,22 +28,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/MSVC_Net2013/glibmm_value.vcxproj.filters b/MSVC_Net2015/glibmm_value.vcxproj.filters index 80e9bb76..80e9bb76 100644 --- a/MSVC_Net2013/glibmm_value.vcxproj.filters +++ b/MSVC_Net2015/glibmm_value.vcxproj.filters diff --git a/MSVC_Net2013/install.vcxproj b/MSVC_Net2015/install.vcxproj index 059ceecc..fb1a1b88 100644 --- a/MSVC_Net2013/install.vcxproj +++ b/MSVC_Net2015/install.vcxproj @@ -28,23 +28,23 @@ <ConfigurationType>Utility</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Utility</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Utility</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Utility</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/MSVC_Net2013/keyfile.vcxproj b/MSVC_Net2015/keyfile.vcxproj index 0993e6a7..b21a4307 100644 --- a/MSVC_Net2013/keyfile.vcxproj +++ b/MSVC_Net2015/keyfile.vcxproj @@ -28,22 +28,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/MSVC_Net2013/keyfile.vcxproj.filters b/MSVC_Net2015/keyfile.vcxproj.filters index dea2aa95..dea2aa95 100644 --- a/MSVC_Net2013/keyfile.vcxproj.filters +++ b/MSVC_Net2015/keyfile.vcxproj.filters diff --git a/MSVC_Net2013/markup.vcxproj b/MSVC_Net2015/markup.vcxproj index 03b32959..804d67bb 100644 --- a/MSVC_Net2013/markup.vcxproj +++ b/MSVC_Net2015/markup.vcxproj @@ -27,22 +27,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/MSVC_Net2013/markup.vcxproj.filters b/MSVC_Net2015/markup.vcxproj.filters index 245f5714..245f5714 100644 --- a/MSVC_Net2013/markup.vcxproj.filters +++ b/MSVC_Net2015/markup.vcxproj.filters diff --git a/MSVC_Net2013/options.vcxproj b/MSVC_Net2015/options.vcxproj index f627c4e3..1d7fe943 100644 --- a/MSVC_Net2013/options.vcxproj +++ b/MSVC_Net2015/options.vcxproj @@ -28,22 +28,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/MSVC_Net2013/options.vcxproj.filters b/MSVC_Net2015/options.vcxproj.filters index 53f47f4c..53f47f4c 100644 --- a/MSVC_Net2013/options.vcxproj.filters +++ b/MSVC_Net2015/options.vcxproj.filters diff --git a/MSVC_Net2013/properties.vcxproj b/MSVC_Net2015/properties.vcxproj index 6858140b..73932622 100644 --- a/MSVC_Net2013/properties.vcxproj +++ b/MSVC_Net2015/properties.vcxproj @@ -28,22 +28,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/MSVC_Net2013/properties.vcxproj.filters b/MSVC_Net2015/properties.vcxproj.filters index a9825fd9..a9825fd9 100644 --- a/MSVC_Net2013/properties.vcxproj.filters +++ b/MSVC_Net2015/properties.vcxproj.filters diff --git a/MSVC_Net2013/regex.vcxproj b/MSVC_Net2015/regex.vcxproj index 84418df6..89dd31d6 100644 --- a/MSVC_Net2013/regex.vcxproj +++ b/MSVC_Net2015/regex.vcxproj @@ -28,22 +28,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/MSVC_Net2013/regex.vcxproj.filters b/MSVC_Net2015/regex.vcxproj.filters index 96dea5e1..96dea5e1 100644 --- a/MSVC_Net2013/regex.vcxproj.filters +++ b/MSVC_Net2015/regex.vcxproj.filters diff --git a/MSVC_Net2013/resolver.vcxproj b/MSVC_Net2015/resolver.vcxproj index 113d86a5..d35176ee 100644 --- a/MSVC_Net2013/resolver.vcxproj +++ b/MSVC_Net2015/resolver.vcxproj @@ -28,22 +28,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/MSVC_Net2013/resolver.vcxproj.filters b/MSVC_Net2015/resolver.vcxproj.filters index 2c9dc796..2c9dc796 100644 --- a/MSVC_Net2013/resolver.vcxproj.filters +++ b/MSVC_Net2015/resolver.vcxproj.filters diff --git a/MSVC_Net2013/socket-client.vcxproj b/MSVC_Net2015/socket-client.vcxproj index 37437082..71d105d7 100644 --- a/MSVC_Net2013/socket-client.vcxproj +++ b/MSVC_Net2015/socket-client.vcxproj @@ -28,22 +28,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/MSVC_Net2013/socket-client.vcxproj.filters b/MSVC_Net2015/socket-client.vcxproj.filters index edb14c14..edb14c14 100644 --- a/MSVC_Net2013/socket-client.vcxproj.filters +++ b/MSVC_Net2015/socket-client.vcxproj.filters diff --git a/MSVC_Net2013/socket-server.vcxproj b/MSVC_Net2015/socket-server.vcxproj index 41162638..2c4bb980 100644 --- a/MSVC_Net2013/socket-server.vcxproj +++ b/MSVC_Net2015/socket-server.vcxproj @@ -28,22 +28,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/MSVC_Net2013/socket-server.vcxproj.filters b/MSVC_Net2015/socket-server.vcxproj.filters index 66a88d3a..66a88d3a 100644 --- a/MSVC_Net2013/socket-server.vcxproj.filters +++ b/MSVC_Net2015/socket-server.vcxproj.filters diff --git a/MSVC_Net2013/thread.vcxproj b/MSVC_Net2015/thread.vcxproj index 9950bbba..4cbff001 100644 --- a/MSVC_Net2013/thread.vcxproj +++ b/MSVC_Net2015/thread.vcxproj @@ -27,22 +27,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/MSVC_Net2013/thread.vcxproj.filters b/MSVC_Net2015/thread.vcxproj.filters index ba19e27b..ba19e27b 100644 --- a/MSVC_Net2013/thread.vcxproj.filters +++ b/MSVC_Net2015/thread.vcxproj.filters diff --git a/MSVC_Net2013/threadpool.vcxproj b/MSVC_Net2015/threadpool.vcxproj index 9ab97488..afd7585a 100644 --- a/MSVC_Net2013/threadpool.vcxproj +++ b/MSVC_Net2015/threadpool.vcxproj @@ -27,22 +27,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/MSVC_Net2013/threadpool.vcxproj.filters b/MSVC_Net2015/threadpool.vcxproj.filters index 4069cf59..4069cf59 100644 --- a/MSVC_Net2013/threadpool.vcxproj.filters +++ b/MSVC_Net2015/threadpool.vcxproj.filters diff --git a/Makefile.am b/Makefile.am index a0df8afe..8abfc501 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,10 +43,10 @@ nodist_giomm_libinclude_HEADERS = gio/giommconfig.h pkgconfigdir = $(libdir)/pkgconfig nodist_pkgconfig_DATA = glib/$(GLIBMM_MODULE_NAME).pc gio/$(GIOMM_MODULE_NAME).pc -include $(srcdir)/MSVC_Net2013/filelist.am +include $(srcdir)/MSVC_Net2015/filelist.am text_files = COPYING.tools README.SUN README.win32 -msvc_files = $(addprefix MSVC_Net2013/,$(msvc_net2013_data)) +msvc_files = $(addprefix MSVC_Net2015/,$(msvc_net2015_data)) dist_noinst_DATA = $(text_files) $(msvc_files) dist_noinst_SCRIPTS = autogen.sh diff --git a/README.win32 b/README.win32 index 71d7285e..1e3ef45d 100644 --- a/README.win32 +++ b/README.win32 @@ -2,7 +2,7 @@ Building glibmm on Win32 =========================== Currently, both the mingw (native win32) gcc compiler and MS Visual -Studio 2013 are supported. glibmm can be built with mingw32-gcc using +Studio 2015 are supported. glibmm can be built with mingw32-gcc using the gnu autotools (automake, autoconf, libtool). As explicitly stated in the gtk+ for win32 distribution (http://www.gimp.org/win32/), the gcc compiler provided by the cygwin distribution should not be used to @@ -44,13 +44,13 @@ make make check make install -2. MS Visual Studio 2013 +2. MS Visual Studio 2015 -Open the glibmm.sln solution file in the MSVC_Net2013 directory. In +Open the glibmm.sln solution file in the MSVC_Net2015 directory. In the Tools/Options panel, add the appropriate GTK+ include and lib directories to the Projects and Solutions/VC++ directories, if they are not in the locations specified by the property sheets, i.e. -$(srcroot)\..\vs12\$(Platform). Build the solution. +$(srcroot)\..\vs14\$(Platform). Build the solution. 3. Glibmm methods and signals not available on win32 diff --git a/configure.ac b/configure.ac index 9e047b6b..61ebfd49 100644 --- a/configure.ac +++ b/configure.ac @@ -169,12 +169,12 @@ AC_CONFIG_FILES([Makefile examples/Makefile docs/Makefile docs/reference/Doxyfile - MSVC_Net2013/glibmm/glibmm.rc - MSVC_Net2013/giomm/giomm.rc]) + MSVC_Net2015/glibmm/glibmm.rc + MSVC_Net2015/giomm/giomm.rc]) # Copy the generated configuration headers into the MSVC project directories. -AC_CONFIG_COMMANDS([MSVC_Net2013/glibmm/glibmmconfig.h], - [cp -f glib/glibmmconfig.h MSVC_Net2013/glibmm/glibmmconfig.h]) -AC_CONFIG_COMMANDS([MSVC_Net2013/giomm/giommconfig.h], - [cp -f gio/giommconfig.h MSVC_Net2013/giomm/giommconfig.h]) +AC_CONFIG_COMMANDS([MSVC_Net2015/glibmm/glibmmconfig.h], + [cp -f glib/glibmmconfig.h MSVC_Net2015/glibmm/glibmmconfig.h]) +AC_CONFIG_COMMANDS([MSVC_Net2015/giomm/giommconfig.h], + [cp -f gio/giommconfig.h MSVC_Net2015/giomm/giommconfig.h]) AC_OUTPUT |