[glibmm] Visual Studio builds: Require Visual Studio 2017
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] Visual Studio builds: Require Visual Studio 2017
- Date: Tue, 14 Mar 2017 07:56:31 +0000 (UTC)
commit c23464d60ca307a612264428ef63fa079ff461c2
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Tue Mar 14 15:52:05 2017 +0800
Visual Studio builds: Require Visual Studio 2017
Visual Studio 2017 is required to support the C++-14 features that
glibmm-2.52 will require, so update the projects to 2017. Make the
projects look for libsigc++-3.x as well.
Also make sure that the glibmm and giomm projects are up-to-date, and
drop the threading examples projects as these examples have been dropped
from the tree, and ensure the headers "installed" are up-to-date.
{MSVC_Net2013 => MSVC_Net2017}/compose.vcxproj | 8 +++---
.../compose.vcxproj.filters | 0
{MSVC_Net2013 => MSVC_Net2017}/dispatcher.vcxproj | 8 +++---
.../dispatcher.vcxproj.filters | 0
{MSVC_Net2013 => MSVC_Net2017}/dispatcher2.vcxproj | 8 +++---
.../dispatcher2.vcxproj.filters | 0
{MSVC_Net2013 => MSVC_Net2017}/filelist.am | 2 +-
{MSVC_Net2013 => MSVC_Net2017}/gendef.vcxproj | 8 +++---
.../gendef.vcxproj.filters | 0
{MSVC_Net2013 => MSVC_Net2017}/gendef/gendef.cc | 0
{MSVC_Net2013 => MSVC_Net2017}/giomm.vcxproj | 10 +++++---
.../giomm.vcxproj.filters | 2 +
{MSVC_Net2013 => MSVC_Net2017}/giomm/giomm.rc.in | 0
.../giomm_simple.vcxproj | 8 +++---
.../giomm_simple.vcxproj.filters | 0
.../glibmm-build-defines.props | 6 ++--
.../glibmm-install.props | 9 +-----
.../glibmm-version-paths.props | 8 +++++-
{MSVC_Net2013 => MSVC_Net2017}/glibmm.sln | 24 +------------------
{MSVC_Net2013 => MSVC_Net2017}/glibmm.vcxproj | 16 +++----------
.../glibmm.vcxproj.filters | 8 ------
{MSVC_Net2013 => MSVC_Net2017}/glibmm/glibmm.rc.in | 0
.../glibmm_value.vcxproj | 8 +++---
.../glibmm_value.vcxproj.filters | 0
{MSVC_Net2013 => MSVC_Net2017}/install.vcxproj | 8 +++---
{MSVC_Net2013 => MSVC_Net2017}/keyfile.vcxproj | 8 +++---
.../keyfile.vcxproj.filters | 0
{MSVC_Net2013 => MSVC_Net2017}/markup.vcxproj | 8 +++---
.../markup.vcxproj.filters | 0
{MSVC_Net2013 => MSVC_Net2017}/options.vcxproj | 8 +++---
.../options.vcxproj.filters | 0
{MSVC_Net2013 => MSVC_Net2017}/properties.vcxproj | 8 +++---
.../properties.vcxproj.filters | 0
{MSVC_Net2013 => MSVC_Net2017}/regex.vcxproj | 8 +++---
.../regex.vcxproj.filters | 0
{MSVC_Net2013 => MSVC_Net2017}/resolver.vcxproj | 8 +++---
.../resolver.vcxproj.filters | 0
.../socket-client.vcxproj | 8 +++---
.../socket-client.vcxproj.filters | 0
.../socket-server.vcxproj | 8 +++---
.../socket-server.vcxproj.filters | 0
{MSVC_Net2013 => MSVC_Net2017}/thread.vcxproj | 8 +++---
.../thread.vcxproj.filters | 0
{MSVC_Net2013 => MSVC_Net2017}/threadpool.vcxproj | 8 +++---
.../threadpool.vcxproj.filters | 0
Makefile.am | 4 +-
configure.ac | 12 +++++-----
47 files changed, 102 insertions(+), 135 deletions(-)
---
diff --git a/MSVC_Net2013/compose.vcxproj b/MSVC_Net2017/compose.vcxproj
similarity index 98%
rename from MSVC_Net2013/compose.vcxproj
rename to MSVC_Net2017/compose.vcxproj
index 4775af3..38cb404 100644
--- a/MSVC_Net2013/compose.vcxproj
+++ b/MSVC_Net2017/compose.vcxproj
@@ -28,22 +28,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/MSVC_Net2013/compose.vcxproj.filters b/MSVC_Net2017/compose.vcxproj.filters
similarity index 100%
rename from MSVC_Net2013/compose.vcxproj.filters
rename to MSVC_Net2017/compose.vcxproj.filters
diff --git a/MSVC_Net2013/dispatcher.vcxproj b/MSVC_Net2017/dispatcher.vcxproj
similarity index 98%
rename from MSVC_Net2013/dispatcher.vcxproj
rename to MSVC_Net2017/dispatcher.vcxproj
index 6c403c0..2e79b92 100644
--- a/MSVC_Net2013/dispatcher.vcxproj
+++ b/MSVC_Net2017/dispatcher.vcxproj
@@ -28,22 +28,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/MSVC_Net2013/dispatcher.vcxproj.filters b/MSVC_Net2017/dispatcher.vcxproj.filters
similarity index 100%
rename from MSVC_Net2013/dispatcher.vcxproj.filters
rename to MSVC_Net2017/dispatcher.vcxproj.filters
diff --git a/MSVC_Net2013/dispatcher2.vcxproj b/MSVC_Net2017/dispatcher2.vcxproj
similarity index 98%
rename from MSVC_Net2013/dispatcher2.vcxproj
rename to MSVC_Net2017/dispatcher2.vcxproj
index db6a5fd..a9f8e25 100644
--- a/MSVC_Net2013/dispatcher2.vcxproj
+++ b/MSVC_Net2017/dispatcher2.vcxproj
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/MSVC_Net2013/dispatcher2.vcxproj.filters b/MSVC_Net2017/dispatcher2.vcxproj.filters
similarity index 100%
rename from MSVC_Net2013/dispatcher2.vcxproj.filters
rename to MSVC_Net2017/dispatcher2.vcxproj.filters
diff --git a/MSVC_Net2013/filelist.am b/MSVC_Net2017/filelist.am
similarity index 98%
rename from MSVC_Net2013/filelist.am
rename to MSVC_Net2017/filelist.am
index a70124a..e22b371 100644
--- a/MSVC_Net2013/filelist.am
+++ b/MSVC_Net2017/filelist.am
@@ -1,6 +1,6 @@
## This file is part of glibmm.
-msvc_net2013_data = \
+msvc_net2017_data = \
glibmm.sln \
glibmm-build-defines.props \
glibmm-install.props \
diff --git a/MSVC_Net2013/gendef.vcxproj b/MSVC_Net2017/gendef.vcxproj
similarity index 97%
rename from MSVC_Net2013/gendef.vcxproj
rename to MSVC_Net2017/gendef.vcxproj
index 62dbcc8..bfc870b 100644
--- a/MSVC_Net2013/gendef.vcxproj
+++ b/MSVC_Net2017/gendef.vcxproj
@@ -26,22 +26,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/MSVC_Net2013/gendef.vcxproj.filters b/MSVC_Net2017/gendef.vcxproj.filters
similarity index 100%
rename from MSVC_Net2013/gendef.vcxproj.filters
rename to MSVC_Net2017/gendef.vcxproj.filters
diff --git a/MSVC_Net2013/gendef/gendef.cc b/MSVC_Net2017/gendef/gendef.cc
similarity index 100%
rename from MSVC_Net2013/gendef/gendef.cc
rename to MSVC_Net2017/gendef/gendef.cc
diff --git a/MSVC_Net2013/giomm.vcxproj b/MSVC_Net2017/giomm.vcxproj
similarity index 98%
rename from MSVC_Net2013/giomm.vcxproj
rename to MSVC_Net2017/giomm.vcxproj
index bc4fc3d..419673a 100644
--- a/MSVC_Net2013/giomm.vcxproj
+++ b/MSVC_Net2017/giomm.vcxproj
@@ -26,22 +26,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -269,6 +269,7 @@
<ClCompile Include="..\gio\giomm\permission.cc" />
<ClCompile Include="..\gio\giomm\pollableinputstream.cc" />
<ClCompile Include="..\gio\giomm\pollableoutputstream.cc" />
+ <ClCompile Include="..\gio\giomm\propertyaction.cc" />
<ClCompile Include="..\gio\giomm\proxy.cc" />
<ClCompile Include="..\gio\giomm\proxyaddress.cc" />
<ClCompile Include="..\gio\giomm\proxyresolver.cc" />
@@ -399,6 +400,7 @@
<ClInclude Include="..\gio\giomm\permission.h" />
<ClInclude Include="..\gio\giomm\pollableinputstream.h" />
<ClInclude Include="..\gio\giomm\pollableoutputstream.h" />
+ <ClInclude Include="..\gio\giomm\propertyaction.h" />
<ClInclude Include="..\gio\giomm\proxy.h" />
<ClInclude Include="..\gio\giomm\proxyaddress.h" />
<ClInclude Include="..\gio\giomm\proxyresolver.h" />
diff --git a/MSVC_Net2013/giomm.vcxproj.filters b/MSVC_Net2017/giomm.vcxproj.filters
similarity index 99%
rename from MSVC_Net2013/giomm.vcxproj.filters
rename to MSVC_Net2017/giomm.vcxproj.filters
index 4f01b13..5ed29e3 100644
--- a/MSVC_Net2013/giomm.vcxproj.filters
+++ b/MSVC_Net2017/giomm.vcxproj.filters
@@ -100,6 +100,7 @@
<ClCompile Include="..\gio\giomm\permission.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gio\giomm\pollableinputstream.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gio\giomm\pollableoutputstream.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\propertyaction.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gio\giomm\proxy.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gio\giomm\proxyaddress.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gio\giomm\proxyresolver.cc"><Filter>Source Files</Filter></ClCompile>
@@ -229,6 +230,7 @@
<ClInclude Include="..\gio\giomm\permission.h"><Filter>Source Files</Filter></ClInclude>
<ClInclude Include="..\gio\giomm\pollableinputstream.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gio\giomm\pollableoutputstream.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\propertyaction.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gio\giomm\proxy.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gio\giomm\proxyaddress.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gio\giomm\proxyresolver.h"><Filter>Header Files</Filter></ClInclude>
diff --git a/MSVC_Net2013/giomm/giomm.rc.in b/MSVC_Net2017/giomm/giomm.rc.in
similarity index 100%
rename from MSVC_Net2013/giomm/giomm.rc.in
rename to MSVC_Net2017/giomm/giomm.rc.in
diff --git a/MSVC_Net2013/giomm_simple.vcxproj b/MSVC_Net2017/giomm_simple.vcxproj
similarity index 98%
rename from MSVC_Net2013/giomm_simple.vcxproj
rename to MSVC_Net2017/giomm_simple.vcxproj
index 1eb6124..bb945b4 100644
--- a/MSVC_Net2013/giomm_simple.vcxproj
+++ b/MSVC_Net2017/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>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/MSVC_Net2013/giomm_simple.vcxproj.filters b/MSVC_Net2017/giomm_simple.vcxproj.filters
similarity index 100%
rename from MSVC_Net2013/giomm_simple.vcxproj.filters
rename to MSVC_Net2017/giomm_simple.vcxproj.filters
diff --git a/MSVC_Net2013/glibmm-build-defines.props b/MSVC_Net2017/glibmm-build-defines.props
similarity index 78%
rename from MSVC_Net2013/glibmm-build-defines.props
rename to MSVC_Net2017/glibmm-build-defines.props
index 5cbde3c..91d6088 100644
--- a/MSVC_Net2013/glibmm-build-defines.props
+++ b/MSVC_Net2017/glibmm-build-defines.props
@@ -6,8 +6,8 @@
<PropertyGroup Label="UserMacros">
<GLibMMBuildDefs>SIZEOF_WCHAR_T=2;GLIBMM_BUILD</GLibMMBuildDefs>
<GioMMBuildDefs>GIOMM_BUILD</GioMMBuildDefs>
- <CPPDepLibsRelease>sigc-vc$(VSVer)0-2_0.lib</CPPDepLibsRelease>
- <CPPDepLibsDebug>sigc-vc$(VSVer)0-d-2_0.lib</CPPDepLibsDebug>
+ <CPPDepLibsRelease>sigc-vc$(VSVer)0-$(SigCMajorVersion)_0.lib</CPPDepLibsRelease>
+ <CPPDepLibsDebug>sigc-vc$(VSVer)0-d-$(SigCMajorVersion)_0.lib</CPPDepLibsDebug>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>glibmmbuilddefinesprops</_PropertySheetDisplayName>
@@ -16,7 +16,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
-
<AdditionalIncludeDirectories>.\glibmm;..;..\glib;$(GlibEtcInstallRoot)\include\sigc++-2.0;$(GlibEtcInstallRoot)\lib\sigc++-2.0\include;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>.\glibmm;..;..\glib;$(GlibEtcInstallRoot)\include\sigc++-$(SigCMajorVersion).0;$(GlibEtcInstallRoot)\lib\sigc++-$(SigCMajorVersion).0\include;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>
diff --git a/MSVC_Net2013/glibmm-install.props b/MSVC_Net2017/glibmm-install.props
similarity index 98%
rename from MSVC_Net2013/glibmm-install.props
rename to MSVC_Net2017/glibmm-install.props
index f28a0c8..a6f1730 100644
--- a/MSVC_Net2013/glibmm-install.props
+++ b/MSVC_Net2017/glibmm-install.props
@@ -80,8 +80,6 @@ copy ..\glib\glibmm\slisthandle.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$
copy ..\glib\glibmm\spawn.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
copy ..\glib\glibmm\streamiochannel.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
copy ..\glib\glibmm\stringutils.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
-copy ..\glib\glibmm\threadpool.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
-copy ..\glib\glibmm\threads.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
copy ..\glib\glibmm\timer.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
copy ..\glib\glibmm\timeval.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
copy ..\glib\glibmm\timezone.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
@@ -94,9 +92,7 @@ copy ..\glib\glibmm\variantdict.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$
copy ..\glib\glibmm\variantiter.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
copy ..\glib\glibmm\varianttype.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
copy ..\glib\glibmm\variant_basictypes.h
$(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
-copy ..\glib\glibmm\thread.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
copy ..\glib\glibmm\value.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
-copy ..\glib\glibmm\valuearray.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
copy ..\glib\glibmm\value_basictypes.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
copy ..\glib\glibmm\value_custom.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
copy ..\glib\glibmm\vectorutils.h $(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm
@@ -128,7 +124,6 @@ copy ..\glib\glibmm\private\optiongroup_p.h $(CopyDir)\include\glibmm-$(ApiMajor
copy ..\glib\glibmm\private\regex_p.h
$(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
copy ..\glib\glibmm\private\shell_p.h
$(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
copy ..\glib\glibmm\private\spawn_p.h
$(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
-copy ..\glib\glibmm\private\threads_p.h
$(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
copy ..\glib\glibmm\private\timezone_p.h
$(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
copy ..\glib\glibmm\private\unicode_p.h
$(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
copy ..\glib\glibmm\private\uriutils_p.h
$(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
@@ -136,8 +131,6 @@ copy ..\glib\glibmm\private\variant_p.h $(CopyDir)\include\glibmm-$(ApiMajorVers
copy ..\glib\glibmm\private\variantdict_p.h
$(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
copy ..\glib\glibmm\private\variantiter_p.h
$(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
copy ..\glib\glibmm\private\varianttype_p.h
$(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
-copy ..\glib\glibmm\private\thread_p.h
$(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
-copy ..\glib\glibmm\private\valuearray_p.h
$(CopyDir)\include\glibmm-$(ApiMajorVersion).$(ApiMinorVersion)\glibmm\private
copy ..\gio\giomm\action.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
copy ..\gio\giomm\actiongroup.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
@@ -224,6 +217,7 @@ copy ..\gio\giomm\outputstream.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(A
copy ..\gio\giomm\permission.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
copy ..\gio\giomm\pollableinputstream.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
copy ..\gio\giomm\pollableoutputstream.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
+copy ..\gio\giomm\propertaction.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
copy ..\gio\giomm\proxy.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
copy ..\gio\giomm\proxyaddress.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
copy ..\gio\giomm\proxyresolver.h $(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm
@@ -349,6 +343,7 @@ copy ..\gio\giomm\private\notification_p.h $(CopyDir)\include\giomm-$(ApiMajorVe
copy ..\gio\giomm\private\outputstream_p.h
$(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
copy ..\gio\giomm\private\pollableinputstream_p.h
$(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
copy ..\gio\giomm\private\pollableoutputstream_p.h
$(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
+copy ..\gio\giomm\private\propertaction.h
$(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
copy ..\gio\giomm\private\proxy_p.h
$(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
copy ..\gio\giomm\private\proxyaddress_p.h
$(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
copy ..\gio\giomm\private\proxyresolver_p.h
$(CopyDir)\include\giomm-$(ApiMajorVersion).$(ApiMinorVersion)\giomm\private
diff --git a/MSVC_Net2013/glibmm-version-paths.props b/MSVC_Net2017/glibmm-version-paths.props
similarity index 88%
rename from MSVC_Net2013/glibmm-version-paths.props
rename to MSVC_Net2017/glibmm-version-paths.props
index 216731b..1956912 100644
--- a/MSVC_Net2013/glibmm-version-paths.props
+++ b/MSVC_Net2017/glibmm-version-paths.props
@@ -1,14 +1,15 @@
<?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>15</VSVer>
<GlibEtcInstallRoot>$(SolutionDir)\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
<CopyDir>$(GlibEtcInstallRoot)</CopyDir>
<DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)\</DefDir>
<ApiMajorVersion>2</ApiMajorVersion>
- <ApiMinorVersion>4</ApiMinorVersion>
+ <ApiMinorVersion>52</ApiMinorVersion>
<ReleaseDllSuffix>-vc$(VSVer)0-$(ApiMajorVersion)_$(ApiMinorVersion)</ReleaseDllSuffix>
<DebugDllSuffix>-vc$(VSVer)0-d-$(ApiMajorVersion)_$(ApiMinorVersion)</DebugDllSuffix>
+ <SigCMajorVersion>3</SigCMajorVersion>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>glibmmversionpathsprops</_PropertySheetDisplayName>
@@ -38,5 +39,8 @@
<BuildMacro Include="DebugDllSuffix">
<Value>$(DebugDllSuffix)</Value>
</BuildMacro>
+ <BuildMacro Include="SigCMajorVersion">
+ <Value>$(SigCMajorVersion)</Value>
+ </BuildMacro>
</ItemGroup>
</Project>
diff --git a/MSVC_Net2013/glibmm.sln b/MSVC_Net2017/glibmm.sln
similarity index 88%
rename from MSVC_Net2013/glibmm.sln
rename to MSVC_Net2017/glibmm.sln
index d71dbc1..4467ac1 100644
--- a/MSVC_Net2013/glibmm.sln
+++ b/MSVC_Net2017/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 15
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}"
@@ -8,10 +8,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "markup", "markup.vcxproj",
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glibmm_value", "glibmm_value.vcxproj",
"{22277003-3228-486E-A6A8-994B8B13AF30}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "thread", "thread.vcxproj",
"{5357AB2B-A5F9-463C-92D8-00357CCC3ECE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threadpool", "threadpool.vcxproj",
"{962484DB-2111-48A4-BEF0-194433719D0D}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dispatcher", "dispatcher.vcxproj",
"{129ECC08-6D30-4884-B824-4AF96EF0A45C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dispatcher2", "dispatcher2.vcxproj",
"{18A82706-B645-4DF5-AB09-06B90128BAC5}"
@@ -78,22 +74,6 @@ Global
{22277003-3228-486E-A6A8-994B8B13AF30}.Release|Win32.Build.0 = Release|Win32
{22277003-3228-486E-A6A8-994B8B13AF30}.Release|x64.ActiveCfg = Release|x64
{22277003-3228-486E-A6A8-994B8B13AF30}.Release|x64.Build.0 = Release|x64
- {5357AB2B-A5F9-463C-92D8-00357CCC3ECE}.Debug|Win32.ActiveCfg = Debug|Win32
- {5357AB2B-A5F9-463C-92D8-00357CCC3ECE}.Debug|Win32.Build.0 = Debug|Win32
- {5357AB2B-A5F9-463C-92D8-00357CCC3ECE}.Debug|x64.ActiveCfg = Debug|x64
- {5357AB2B-A5F9-463C-92D8-00357CCC3ECE}.Debug|x64.Build.0 = Debug|x64
- {5357AB2B-A5F9-463C-92D8-00357CCC3ECE}.Release|Win32.ActiveCfg = Release|Win32
- {5357AB2B-A5F9-463C-92D8-00357CCC3ECE}.Release|Win32.Build.0 = Release|Win32
- {5357AB2B-A5F9-463C-92D8-00357CCC3ECE}.Release|x64.ActiveCfg = Release|x64
- {5357AB2B-A5F9-463C-92D8-00357CCC3ECE}.Release|x64.Build.0 = Release|x64
- {962484DB-2111-48A4-BEF0-194433719D0D}.Debug|Win32.ActiveCfg = Debug|Win32
- {962484DB-2111-48A4-BEF0-194433719D0D}.Debug|Win32.Build.0 = Debug|Win32
- {962484DB-2111-48A4-BEF0-194433719D0D}.Debug|x64.ActiveCfg = Debug|x64
- {962484DB-2111-48A4-BEF0-194433719D0D}.Debug|x64.Build.0 = Debug|x64
- {962484DB-2111-48A4-BEF0-194433719D0D}.Release|Win32.ActiveCfg = Release|Win32
- {962484DB-2111-48A4-BEF0-194433719D0D}.Release|Win32.Build.0 = Release|Win32
- {962484DB-2111-48A4-BEF0-194433719D0D}.Release|x64.ActiveCfg = Release|x64
- {962484DB-2111-48A4-BEF0-194433719D0D}.Release|x64.Build.0 = Release|x64
{129ECC08-6D30-4884-B824-4AF96EF0A45C}.Debug|Win32.ActiveCfg = Debug|Win32
{129ECC08-6D30-4884-B824-4AF96EF0A45C}.Debug|Win32.Build.0 = Debug|Win32
{129ECC08-6D30-4884-B824-4AF96EF0A45C}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/MSVC_Net2013/glibmm.vcxproj b/MSVC_Net2017/glibmm.vcxproj
similarity index 96%
rename from MSVC_Net2013/glibmm.vcxproj
rename to MSVC_Net2017/glibmm.vcxproj
index 6594edc..8b92378 100644
--- a/MSVC_Net2013/glibmm.vcxproj
+++ b/MSVC_Net2017/glibmm.vcxproj
@@ -28,22 +28,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -245,9 +245,6 @@
<ClCompile Include="..\glib\glibmm\spawn.cc" />
<ClCompile Include="..\glib\glibmm\streamiochannel.cc" />
<ClCompile Include="..\glib\glibmm\stringutils.cc" />
- <ClCompile Include="..\glib\glibmm\thread.cc" />
- <ClCompile Include="..\glib\glibmm\threadpool.cc" />
- <ClCompile Include="..\glib\glibmm\threads.cc" />
<ClCompile Include="..\glib\glibmm\timer.cc" />
<ClCompile Include="..\glib\glibmm\timeval.cc" />
<ClCompile Include="..\glib\glibmm\timezone.cc" />
@@ -258,7 +255,6 @@
<ClCompile Include="..\glib\glibmm\value.cc" />
<ClCompile Include="..\glib\glibmm\value_basictypes.cc" />
<ClCompile Include="..\glib\glibmm\value_custom.cc" />
- <ClCompile Include="..\glib\glibmm\valuearray.cc" />
<ClCompile Include="..\glib\glibmm\variant.cc" />
<ClCompile Include="..\glib\glibmm\variantdict.cc" />
<ClCompile Include="..\glib\glibmm\variantiter.cc" />
@@ -323,9 +319,6 @@
<ClInclude Include="..\glib\glibmm\spawn.h" />
<ClInclude Include="..\glib\glibmm\streamiochannel.h" />
<ClInclude Include="..\glib\glibmm\stringutils.h" />
- <ClInclude Include="..\glib\glibmm\thread.h" />
- <ClInclude Include="..\glib\glibmm\threadpool.h" />
- <ClInclude Include="..\glib\glibmm\threads.h" />
<ClInclude Include="..\glib\glibmm\timer.h" />
<ClInclude Include="..\glib\glibmm\timeval.h" />
<ClInclude Include="..\glib\glibmm\timezone.h" />
@@ -336,7 +329,6 @@
<ClInclude Include="..\glib\glibmm\value.h" />
<ClInclude Include="..\glib\glibmm\value_basictypes.h" />
<ClInclude Include="..\glib\glibmm\value_custom.h" />
- <ClInclude Include="..\glib\glibmm\valuearray.h" />
<ClInclude Include="..\glib\glibmm\variant.h" />
<ClInclude Include="..\glib\glibmm\variantdict.h" />
<ClInclude Include="..\glib\glibmm\variantiter.h" />
diff --git a/MSVC_Net2013/glibmm.vcxproj.filters b/MSVC_Net2017/glibmm.vcxproj.filters
similarity index 94%
rename from MSVC_Net2013/glibmm.vcxproj.filters
rename to MSVC_Net2017/glibmm.vcxproj.filters
index 578c253..06db066 100644
--- a/MSVC_Net2013/glibmm.vcxproj.filters
+++ b/MSVC_Net2017/glibmm.vcxproj.filters
@@ -62,9 +62,6 @@
<ClCompile Include="..\glib\glibmm\spawn.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\glib\glibmm\streamiochannel.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\glib\glibmm\stringutils.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\glib\glibmm\thread.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\glib\glibmm\threadpool.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\glib\glibmm\threads.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\glib\glibmm\timer.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\glib\glibmm\timeval.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\glib\glibmm\timezone.cc"><Filter>Source Files</Filter></ClCompile>
@@ -75,7 +72,6 @@
<ClCompile Include="..\glib\glibmm\value.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\glib\glibmm\value_basictypes.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\glib\glibmm\value_custom.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\glib\glibmm\valuearray.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\glib\glibmm\variant.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\glib\glibmm\variantdict.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\glib\glibmm\variantiter.cc"><Filter>Source Files</Filter></ClCompile>
@@ -140,9 +136,6 @@
<ClInclude Include="..\glib\glibmm\spawn.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\glib\glibmm\streamiochannel.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\glib\glibmm\stringutils.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\glib\glibmm\thread.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\glib\glibmm\threadpool.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\glib\glibmm\threads.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\glib\glibmm\timer.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\glib\glibmm\timeval.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\glib\glibmm\timezone.h"><Filter>Header Files</Filter></ClInclude>
@@ -153,7 +146,6 @@
<ClInclude Include="..\glib\glibmm\value.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\glib\glibmm\value_basictypes.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\glib\glibmm\value_custom.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\glib\glibmm\valuearray.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\glib\glibmm\variant.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\glib\glibmm\variantdict.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\glib\glibmm\variantiter.h"><Filter>Header Files</Filter></ClInclude>
diff --git a/MSVC_Net2013/glibmm/glibmm.rc.in b/MSVC_Net2017/glibmm/glibmm.rc.in
similarity index 100%
rename from MSVC_Net2013/glibmm/glibmm.rc.in
rename to MSVC_Net2017/glibmm/glibmm.rc.in
diff --git a/MSVC_Net2013/glibmm_value.vcxproj b/MSVC_Net2017/glibmm_value.vcxproj
similarity index 98%
rename from MSVC_Net2013/glibmm_value.vcxproj
rename to MSVC_Net2017/glibmm_value.vcxproj
index 9639003..e191a1c 100644
--- a/MSVC_Net2013/glibmm_value.vcxproj
+++ b/MSVC_Net2017/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>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/MSVC_Net2013/glibmm_value.vcxproj.filters b/MSVC_Net2017/glibmm_value.vcxproj.filters
similarity index 100%
rename from MSVC_Net2013/glibmm_value.vcxproj.filters
rename to MSVC_Net2017/glibmm_value.vcxproj.filters
diff --git a/MSVC_Net2013/install.vcxproj b/MSVC_Net2017/install.vcxproj
similarity index 97%
rename from MSVC_Net2013/install.vcxproj
rename to MSVC_Net2017/install.vcxproj
index 059ceec..4b18af2 100644
--- a/MSVC_Net2013/install.vcxproj
+++ b/MSVC_Net2017/install.vcxproj
@@ -28,23 +28,23 @@
<ConfigurationType>Utility</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/MSVC_Net2013/keyfile.vcxproj b/MSVC_Net2017/keyfile.vcxproj
similarity index 98%
rename from MSVC_Net2013/keyfile.vcxproj
rename to MSVC_Net2017/keyfile.vcxproj
index 0993e6a..ed71d95 100644
--- a/MSVC_Net2013/keyfile.vcxproj
+++ b/MSVC_Net2017/keyfile.vcxproj
@@ -28,22 +28,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/MSVC_Net2013/keyfile.vcxproj.filters b/MSVC_Net2017/keyfile.vcxproj.filters
similarity index 100%
rename from MSVC_Net2013/keyfile.vcxproj.filters
rename to MSVC_Net2017/keyfile.vcxproj.filters
diff --git a/MSVC_Net2013/markup.vcxproj b/MSVC_Net2017/markup.vcxproj
similarity index 98%
rename from MSVC_Net2013/markup.vcxproj
rename to MSVC_Net2017/markup.vcxproj
index 03b3295..60fb2c4 100644
--- a/MSVC_Net2013/markup.vcxproj
+++ b/MSVC_Net2017/markup.vcxproj
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/MSVC_Net2013/markup.vcxproj.filters b/MSVC_Net2017/markup.vcxproj.filters
similarity index 100%
rename from MSVC_Net2013/markup.vcxproj.filters
rename to MSVC_Net2017/markup.vcxproj.filters
diff --git a/MSVC_Net2013/options.vcxproj b/MSVC_Net2017/options.vcxproj
similarity index 98%
rename from MSVC_Net2013/options.vcxproj
rename to MSVC_Net2017/options.vcxproj
index f627c4e..3ba9d67 100644
--- a/MSVC_Net2013/options.vcxproj
+++ b/MSVC_Net2017/options.vcxproj
@@ -28,22 +28,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/MSVC_Net2013/options.vcxproj.filters b/MSVC_Net2017/options.vcxproj.filters
similarity index 100%
rename from MSVC_Net2013/options.vcxproj.filters
rename to MSVC_Net2017/options.vcxproj.filters
diff --git a/MSVC_Net2013/properties.vcxproj b/MSVC_Net2017/properties.vcxproj
similarity index 98%
rename from MSVC_Net2013/properties.vcxproj
rename to MSVC_Net2017/properties.vcxproj
index 6858140..aafebf5 100644
--- a/MSVC_Net2013/properties.vcxproj
+++ b/MSVC_Net2017/properties.vcxproj
@@ -28,22 +28,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/MSVC_Net2013/properties.vcxproj.filters b/MSVC_Net2017/properties.vcxproj.filters
similarity index 100%
rename from MSVC_Net2013/properties.vcxproj.filters
rename to MSVC_Net2017/properties.vcxproj.filters
diff --git a/MSVC_Net2013/regex.vcxproj b/MSVC_Net2017/regex.vcxproj
similarity index 98%
rename from MSVC_Net2013/regex.vcxproj
rename to MSVC_Net2017/regex.vcxproj
index 84418df..490b1b6 100644
--- a/MSVC_Net2013/regex.vcxproj
+++ b/MSVC_Net2017/regex.vcxproj
@@ -28,22 +28,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/MSVC_Net2013/regex.vcxproj.filters b/MSVC_Net2017/regex.vcxproj.filters
similarity index 100%
rename from MSVC_Net2013/regex.vcxproj.filters
rename to MSVC_Net2017/regex.vcxproj.filters
diff --git a/MSVC_Net2013/resolver.vcxproj b/MSVC_Net2017/resolver.vcxproj
similarity index 98%
rename from MSVC_Net2013/resolver.vcxproj
rename to MSVC_Net2017/resolver.vcxproj
index 113d86a..b6461be 100644
--- a/MSVC_Net2013/resolver.vcxproj
+++ b/MSVC_Net2017/resolver.vcxproj
@@ -28,22 +28,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/MSVC_Net2013/resolver.vcxproj.filters b/MSVC_Net2017/resolver.vcxproj.filters
similarity index 100%
rename from MSVC_Net2013/resolver.vcxproj.filters
rename to MSVC_Net2017/resolver.vcxproj.filters
diff --git a/MSVC_Net2013/socket-client.vcxproj b/MSVC_Net2017/socket-client.vcxproj
similarity index 98%
rename from MSVC_Net2013/socket-client.vcxproj
rename to MSVC_Net2017/socket-client.vcxproj
index 3743708..5058f19 100644
--- a/MSVC_Net2013/socket-client.vcxproj
+++ b/MSVC_Net2017/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>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/MSVC_Net2013/socket-client.vcxproj.filters b/MSVC_Net2017/socket-client.vcxproj.filters
similarity index 100%
rename from MSVC_Net2013/socket-client.vcxproj.filters
rename to MSVC_Net2017/socket-client.vcxproj.filters
diff --git a/MSVC_Net2013/socket-server.vcxproj b/MSVC_Net2017/socket-server.vcxproj
similarity index 98%
rename from MSVC_Net2013/socket-server.vcxproj
rename to MSVC_Net2017/socket-server.vcxproj
index 4116263..b925f87 100644
--- a/MSVC_Net2013/socket-server.vcxproj
+++ b/MSVC_Net2017/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>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/MSVC_Net2013/socket-server.vcxproj.filters b/MSVC_Net2017/socket-server.vcxproj.filters
similarity index 100%
rename from MSVC_Net2013/socket-server.vcxproj.filters
rename to MSVC_Net2017/socket-server.vcxproj.filters
diff --git a/MSVC_Net2013/thread.vcxproj b/MSVC_Net2017/thread.vcxproj
similarity index 98%
rename from MSVC_Net2013/thread.vcxproj
rename to MSVC_Net2017/thread.vcxproj
index 9950bbb..24e9b3b 100644
--- a/MSVC_Net2013/thread.vcxproj
+++ b/MSVC_Net2017/thread.vcxproj
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/MSVC_Net2013/thread.vcxproj.filters b/MSVC_Net2017/thread.vcxproj.filters
similarity index 100%
rename from MSVC_Net2013/thread.vcxproj.filters
rename to MSVC_Net2017/thread.vcxproj.filters
diff --git a/MSVC_Net2013/threadpool.vcxproj b/MSVC_Net2017/threadpool.vcxproj
similarity index 98%
rename from MSVC_Net2013/threadpool.vcxproj
rename to MSVC_Net2017/threadpool.vcxproj
index 9ab9748..4ff8ebe 100644
--- a/MSVC_Net2013/threadpool.vcxproj
+++ b/MSVC_Net2017/threadpool.vcxproj
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/MSVC_Net2013/threadpool.vcxproj.filters b/MSVC_Net2017/threadpool.vcxproj.filters
similarity index 100%
rename from MSVC_Net2013/threadpool.vcxproj.filters
rename to MSVC_Net2017/threadpool.vcxproj.filters
diff --git a/Makefile.am b/Makefile.am
index a0df8af..7cda466 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_Net2017/filelist.am
text_files = COPYING.tools README.SUN README.win32
-msvc_files = $(addprefix MSVC_Net2013/,$(msvc_net2013_data))
+msvc_files = $(addprefix MSVC_Net2017/,$(msvc_net2017_data))
dist_noinst_DATA = $(text_files) $(msvc_files)
dist_noinst_SCRIPTS = autogen.sh
diff --git a/configure.ac b/configure.ac
index 32353dc..6da768f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -155,12 +155,12 @@ AC_CONFIG_FILES([Makefile
examples/Makefile
docs/Makefile
docs/reference/Doxyfile
- MSVC_Net2013/glibmm/glibmm.rc
- MSVC_Net2013/giomm/giomm.rc])
+ MSVC_Net2017/glibmm/glibmm.rc
+ MSVC_Net2017/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_Net2017/glibmm/glibmmconfig.h],
+ [cp -f glib/glibmmconfig.h MSVC_Net2017/glibmm/glibmmconfig.h])
+AC_CONFIG_COMMANDS([MSVC_Net2017/giomm/giommconfig.h],
+ [cp -f gio/giommconfig.h MSVC_Net2017/giomm/giommconfig.h])
AC_OUTPUT
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]