[gtk+] MSVC builds: Support MSVC 2013 and later

From: Chun-wei Fan <fanchunwei src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk+] MSVC builds: Support MSVC 2013 and later
Date: Wed, 26 Oct 2016 08:47:46 +0000 (UTC)

commit 2ba64e0b6249647240186c70c4fd0b52a1f0ed51
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Oct 26 13:42:43 2016 +0800

    MSVC builds: Support MSVC 2013 and later
    
    We now need C99 features from the compiler which are only supported by
    Visual Studio 2013 and later, so drop the MSVC 2008~2012 projects, and make
    the baseline supported Visual Studio version be 2013.  Update the build files
    as a result.

 build/Makefile-newvs.am                            |   30 +-
 build/win32/Makefile.am                            |    3 -
 build/win32/vs10/Makefile.am                       |   78 -----
 build/win32/vs11/Makefile.am                       |   49 ---
 build/win32/vs12/Makefile.am                       |   99 ++++---
 build/win32/{vs10 => vs12}/README.txt              |   36 ++--
 .../{vs10 => vs12}/broadwayd.vcxproj.filtersin     |    2 +-
 build/win32/{vs10 => vs12}/broadwayd.vcxprojin     |   10 +-
 build/win32/{vs10 => vs12}/gdk-4.vcxproj.filtersin |    2 +-
 build/win32/{vs10 => vs12}/gdk-4.vcxprojin         |   18 +-
 .../{vs10 => vs12}/gdk4-broadway.vcxproj.filtersin |    2 +-
 build/win32/{vs10 => vs12}/gdk4-broadway.vcxprojin |   10 +-
 .../{vs10 => vs12}/gdk4-win32.vcxproj.filtersin    |    2 +-
 build/win32/{vs10 => vs12}/gdk4-win32.vcxprojin    |   10 +-
 build/win32/{vs10 => vs12}/gtk+-4.sln              |    4 +-
 build/win32/{vs10 => vs12}/gtk-4.vcxproj.filtersin |    2 +-
 build/win32/{vs10 => vs12}/gtk-4.vcxprojin         |   10 +-
 .../win32/{vs10 => vs12}/gtk-builder-tool.vcxproj  |    8 +-
 .../gtk-builder-tool.vcxproj.filters               |    0
 .../{vs10 => vs12}/gtk-encode-symbolic-svg.vcxproj |    8 +-
 .../gtk-encode-symbolic-svg.vcxproj.filters        |    0
 .../{vs10 => vs12}/gtk-query-settings.vcxproj      |    8 +-
 .../gtk-query-settings.vcxproj.filters             |    0
 .../{vs10 => vs12}/gtk-update-icon-cache.vcxproj   |    8 +-
 .../gtk-update-icon-cache.vcxproj.filters          |    0
 .../win32/{vs10 => vs12}/gtk4-build-defines.props  |    0
 .../{vs10 => vs12}/gtk4-copy-gdk-broadway.props    |    0
 .../gtk4-demo-application.vcxproj.filtersin        |    2 +-
 .../{vs10 => vs12}/gtk4-demo-application.vcxprojin |   10 +-
 .../{vs10 => vs12}/gtk4-demo.vcxproj.filtersin     |    2 +-
 build/win32/{vs10 => vs12}/gtk4-demo.vcxprojin     |   10 +-
 build/win32/{vs10 => vs12}/gtk4-gen-srcs.props     |    0
 .../gtk4-icon-browser.vcxproj.filtersin            |    2 +-
 .../{vs10 => vs12}/gtk4-icon-browser.vcxprojin     |   10 +-
 .../{vs10 => vs12}/gtk4-ignore-broadway.props      |    0
 build/win32/{vs10 => vs12}/gtk4-install.propsin    |    8 +-
 build/win32/{vs10 => vs12}/gtk4-install.vcxproj    |   16 +-
 .../{vs10 => vs12}/gtk4-install.vcxproj.filters    |    0
 build/win32/{vs10 => vs12}/gtk4-prebuild.vcxproj   |   16 +-
 .../{vs10 => vs12}/gtk4-prebuild.vcxproj.filters   |    0
 .../{vs10 => vs12}/gtk4-version-paths.props.in     |    2 +-
 build/win32/vs14/Makefile.am                       |    2 +
 build/win32/vs9/Makefile.am                        |   52 ----
 build/win32/vs9/README.txt                         |  100 -------
 build/win32/vs9/broadwayd.vcprojin                 |  176 -----------
 build/win32/vs9/gdk-4.vcprojin                     |  304 -------------------
 build/win32/vs9/gdk4-broadway.vcprojin             |  130 --------
 build/win32/vs9/gdk4-win32.vcprojin                |  130 --------
 build/win32/vs9/gtk+-4.sln                         |  309 --------------------
 build/win32/vs9/gtk-4.vcprojin                     |  281 ------------------
 build/win32/vs9/gtk-builder-tool.vcproj            |  172 -----------
 build/win32/vs9/gtk-encode-symbolic-svg.vcproj     |  176 -----------
 build/win32/vs9/gtk-query-settings.vcproj          |  172 -----------
 build/win32/vs9/gtk-update-icon-cache.vcproj       |  172 -----------
 build/win32/vs9/gtk4-build-defines.vsprops         |   62 ----
 build/win32/vs9/gtk4-copy-gdk-broadway.vsprops     |   33 --
 build/win32/vs9/gtk4-demo-application.vcprojin     |  168 -----------
 build/win32/vs9/gtk4-demo.vcprojin                 |  174 -----------
 build/win32/vs9/gtk4-gen-srcs.vsprops              |   81 -----
 build/win32/vs9/gtk4-icon-browser.vcprojin         |  176 -----------
 build/win32/vs9/gtk4-ignore-broadway.vsprops       |   14 -
 build/win32/vs9/gtk4-install.vcproj                |  204 -------------
 build/win32/vs9/gtk4-install.vspropsin             |  154 ----------
 build/win32/vs9/gtk4-prebuild.vcproj               |  282 ------------------
 build/win32/vs9/gtk4-version-paths.vsprops.in      |   61 ----
 configure.ac                                       |    6 +-
 demos/gtk-demo/Makefile.am                         |    4 +-
 demos/icon-browser/Makefile.am                     |    2 +-
 gdk/Makefile.am                                    |    4 +-
 gdk/broadway/Makefile.am                           |    6 +-
 gdk/win32/Makefile.am                              |    4 +-
 gtk/Makefile.am                                    |    4 +-
 72 files changed, 203 insertions(+), 3889 deletions(-)
---
diff --git a/build/Makefile-newvs.am b/build/Makefile-newvs.am
index b5e3216..9fd89f9 100644
--- a/build/Makefile-newvs.am
+++ b/build/Makefile-newvs.am
@@ -9,37 +9,39 @@
 # Author: Fan, Chun-wei
 # November 05, 2012
 
+# MSVC_BASE_VER: Baseline MSVC 201x version to copy/process project files from (10 for 2010, 11 for 2012, 12 
for 2013, 14 for 2015 and so on)
+# MSVC_BASE_VER_LONG: Long Version of baseline Visual Studio 201x version (2010, 2012, 2013, 14 and so on)
 # MSVC_VER_LONG: Long Version of Visual Studio (2012, 2013, 14 and so on)
 # MSVC_VER: Short Version of Visual Studio (11 for 2012, 12 for 2013, 14 for 2015 and so on)
 # MSVC_FORMAT_VER: Use 12 for MSVC 2012 through 2015
 
 %.sln:
-       sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs10/$@ > 
$(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
-       sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > 
$(top_builddir)/build/win32/vs$(MSVC_VER)/$@
+       sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@ > 
$(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
+       sed 's/$(MSVC_BASE_VER_LONG)/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > 
$(top_builddir)/build/win32/vs$(MSVC_VER)/$@
        rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
 
 %.txt:
-       sed 's/vs10/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs10/$@ > 
$(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
-       sed 's/VS10/VS$(MSVC_VER)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > 
$(top_builddir)/build/win32/vs$(MSVC_VER)/$@
+       sed 's/vs$(MSVC_BASE_VER)/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@ > 
$(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
+       sed 's/VS$(MSVC_BASE_VER)/VS$(MSVC_VER)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > 
$(top_builddir)/build/win32/vs$(MSVC_VER)/$@
        rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
 
 %.vcxproj:
-       if test -e $(top_srcdir)/build/win32/vs10/$@; then \
-               sed 's/v100/v$(MSVC_VER)0/g' < $(top_srcdir)/build/win32/vs10/$@ > 
$(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+       if test -e $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@; then \
+               sed 's/v$(MSVC_BASE_VER)0/v$(MSVC_VER)0/g' < $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@

$(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \

        else \
-               sed 's/v100/v$(MSVC_VER)0/g' < $(top_builddir)/build/win32/vs10/$@ > 
$(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+               sed 's/v$(MSVC_BASE_VER)0/v$(MSVC_VER)0/g' < 
$(top_builddir)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
        fi
 
-%.props: $(top_builddir)/build/win32/vs10/Makefile
-       if test -e $(top_srcdir)/build/win32/vs10/$@; then \
-               sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs10/$@

$(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \

+%.props: $(top_builddir)/build/win32/vs$(MSVC_BASE_VER)/Makefile
+       if test -e $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@; then \
+               sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < 
$(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
        else \
-               sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < 
$(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+               sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < 
$(top_builddir)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
        fi
 
 %.vcxproj.filters:
-       if test -e $(top_srcdir)/build/win32/vs10/$@; then \
-               cp $(top_srcdir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+       if test -e $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@; then \
+               cp $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@ 
$(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
        else \
-               cp $(top_builddir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+               cp $(top_builddir)/build/win32/vs$(MSVC_BASE_VER)/$@ 
$(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
        fi
diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am
index 60f01af..17294f5 100644
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -27,9 +27,6 @@ DISTCLEANFILES =
 endif
 
 SUBDIRS =      \
-       vs9     \
-       vs10    \
-       vs11    \
        vs12    \
        vs14
 
diff --git a/build/win32/vs12/Makefile.am b/build/win32/vs12/Makefile.am
index 1303214..8c37a97 100644
--- a/build/win32/vs12/Makefile.am
+++ b/build/win32/vs12/Makefile.am
@@ -1,49 +1,76 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST +=  \
-       README.txt      \
-       gtk+-4.sln      \
-       gtk4-prebuild.vcxproj   \
-       gtk4-prebuild.vcxproj.filters   \
-       gdk4-win32.vcxproj      \
-       gdk4-win32.vcxproj.filters      \
-       gdk-4.vcxproj   \
-       gdk-4.vcxproj.filters   \
-       gtk-4.vcxproj   \
-       gtk-4.vcxproj.filters   \
+GENERATED_ITEMS = \
+       gdk4-win32.vcxproj                      \
+       gdk4-win32.vcxproj.filters              \
+       gdk4-broadway.vcxproj                   \
+       gdk4-broadway.vcxproj.filters           \
+       broadwayd.vcxproj                       \
+       broadwayd.vcxproj.filters               \
+       gdk-4.vcxproj                           \
+       gdk-4.vcxproj.filters                   \
+       gtk-4.vcxproj                           \
+       gtk-4.vcxproj.filters                   \
+       gtk4-demo.vcxproj                       \
+       gtk4-demo.vcxproj.filters               \
+       gtk4-demo-application.vcxproj           \
+       gtk4-demo-application.vcxproj.filters   \
+       gtk4-icon-browser.vcxproj               \
+       gtk4-icon-browser.vcxproj.filters       \
+       gtk4-install.props                      \
+       gtk4-version-paths.props
+
+MSVC12_HEADERS_LISTS = \
+       gdk4-win32.vs12.headers         \
+       gdk4-broadway.vs12.headers      \
+       gdk-4.vs12.headers              \
+       gtk-4.vs12.headers
+
+EXTRA_DIST += \
+       README.txt                              \
+       gtk+-4.sln                              \
+       gtk4-prebuild.vcxproj                   \
+       gtk4-prebuild.vcxproj.filters           \
+       gdk4-win32.vcxprojin                    \
+       gdk4-win32.vcxproj.filtersin            \
+       gdk4-broadway.vcxprojin                 \
+       gdk4-broadway.vcxproj.filtersin         \
+       broadwayd.vcxprojin                     \
+       broadwayd.vcxproj.filtersin             \
+       gdk-4.vcxprojin                         \
+       gdk-4.vcxproj.filtersin                 \
+       gtk-4.vcxprojin                         \
+       gtk-4.vcxproj.filtersin                 \
        gtk-builder-tool.vcxproj                \
        gtk-builder-tool.vcxproj.filters        \
-       gtk-encode-symbolic-svg.vcxproj \
+       gtk-encode-symbolic-svg.vcxproj         \
        gtk-encode-symbolic-svg.vcxproj.filters \
        gtk-query-settings.vcxproj              \
        gtk-query-settings.vcxproj.filters      \
        gtk-update-icon-cache.vcxproj           \
        gtk-update-icon-cache.vcxproj.filters   \
-       gtk4-demo.vcxproj       \
-       gtk4-demo.vcxproj.filters       \
-       gtk4-demo-application.vcxproj   \
-       gtk4-demo-application.vcxproj.filters   \
-       gtk4-icon-browser.vcxproj       \
-       gtk4-icon-browser.vcxproj.filters       \
-       gtk4-install.vcxproj    \
-       gtk4-install.vcxproj.filters    \
-       broadwayd.vcxproj       \
-       broadwayd.vcxproj.filters       \
-       gdk4-broadway.vcxproj   \
-       gdk4-broadway.vcxproj.filters   \
-       gtk4-build-defines.props        \
-       gtk4-copy-gdk-broadway.props    \
-       gtk4-gen-srcs.props     \
-       gtk4-ignore-broadway.props      \
-       gtk4-install.props      \
-       gtk4-version-paths.props
-
-DISTCLEANFILES = $(EXTRA_DIST)
+       gtk4-demo.vcxprojin                     \
+       gtk4-demo.vcxproj.filtersin             \
+       gtk4-demo-application.vcxprojin         \
+       gtk4-demo-application.vcxproj.filtersin \
+       gtk4-icon-browser.vcxprojin             \
+       gtk4-icon-browser.vcxproj.filtersin     \
+       gtk4-install.vcxproj                    \
+       gtk4-install.vcxproj.filters            \
+       gtk4-build-defines.props                \
+       gtk4-copy-gdk-broadway.props            \
+       gtk4-gen-srcs.props                     \
+       gtk4-ignore-broadway.props              \
+       gtk4-install.propsin                    \
+       gtk4-version-paths.props.in             \
+       $(GENERATED_ITEMS)
 
-MSVC_VER = 12
-MSVC_FORMAT_VER = 12
-MSVC_VER_LONG = 2013
+DISTCLEANFILES = \
+       $(GENERATED_ITEMS)
 
-include $(top_srcdir)/build/Makefile-newvs.am
+gtk4-install.props: $(top_srcdir)/build/win32/vs12/gtk4-install.propsin $(MSVC12_HEADERS_LISTS)
+       -$(RM) $(top_builddir)/build/win32/vs14/gtk4-install.props
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs12/gtk4-install.propsin >$@
+       rm $(MSVC12_HEADERS_LISTS)
 
 -include $(top_srcdir)/git.mk
diff --git a/build/win32/vs10/README.txt b/build/win32/vs12/README.txt
similarity index 78%
rename from build/win32/vs10/README.txt
rename to build/win32/vs12/README.txt
index 3ccb187..2abcd66 100644
--- a/build/win32/vs10/README.txt
+++ b/build/win32/vs12/README.txt
@@ -7,7 +7,7 @@ C++ can be found in the following GNOME Live! page:
 
 https://wiki.gnome.org/Projects/GTK+/Win32/MSVCCompilationOfGTKStack
 
-This VS10 solution and the projects it includes are intented to be used
+This VS12 solution and the projects it includes are intented to be used
 in a GTK+ source tree unpacked from a tarball. In a git checkout you
 first need to use some Unix-like environment or manual work to expand
 the files needed, like config.h.win32.in into config.h.win32 and the
@@ -18,7 +18,7 @@ You will need the parts from below in the GTK+ stack: GDK-Pixbuf, Pango,
 ATK and GLib.  External dependencies are at least Cairo
 (with Cairo-GObject support, meaning Cairo 1.10.x or later), zlib, libpng,
 gettext-runtime, fontconfig*, freetype*, expat*.  See the 
-build/win32/vs10/README.txt file in glib for details where to unpack them.
+build/win32/vs12/README.txt file in glib for details where to unpack them.
 
 You will also need a Python 2.6+/3.x interpretor installed on your system,
 which can be obtained from the official installers available from
@@ -29,34 +29,34 @@ If you happen to change the PythonPath setting in gtk-version-paths.props after
 opening gtk+.sln with Visual Studio, you will need to close the gtk+.sln solution,
 delete all the *.sdf, *.suo and *.user files before re-attempting the build.
 
-It is recommended that one builds the dependencies with VS10 as far as
+It is recommended that one builds the dependencies with VS12 as far as
 possible, especially those from and using the GTK+ stack (i.e. GLib,
 Cairo, ATK, Pango, GDK-Pixbuf), so that crashes caused by mixing calls
 to different CRTs can be kept at a minimum.
 
-zlib, libpng, and Cairo do contain support for compiling under VS10
+zlib, libpng, and Cairo do contain support for compiling under VS12
 using VS project files and/or makefiles at this time of writing, For the
-GTK+ stack, VS10 project files are either available under
-$(srcroot)/build/vs10 in the case of GLib (stable/unstable), ATK
+GTK+ stack, VS12 project files are either available under
+$(srcroot)/build/vs12 in the case of GLib (stable/unstable), ATK
 (stable/unstable) and GDK-Pixbuf (unstable), and should be in the next
-unstable version of Pango.  There is no known official VS10 build
+unstable version of Pango.  There is no known official VS12 build
 support for fontconfig (along with freetype and expat) and
 gettext-runtime, so please use the binaries from: 
 
 ftp://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32 bit)
 ftp://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64 bit)
 
-Unzip the binaries obtained from ftp.gnome.org in <root>\vs10\<PlatformName>,
+Unzip the binaries obtained from ftp.gnome.org in <root>\vs12\<PlatformName>,
 and build the following, if not already done so: 
 
 Note: put the resulting zlib, libpng, pcre and Cairo files as follows:
- .dll files: <root>\vs10\<PlatformName>\bin
- .lib files: <root>\vs10\<PlatformName>\lib
- .h files: <root>\vs10\<PlatformName>\include
+ .dll files: <root>\vs12\<PlatformName>\bin
+ .lib files: <root>\vs12\<PlatformName>\lib
+ .h files: <root>\vs12\<PlatformName>\include
 
 The recommended build order for these dependencies:
 (first unzip any dependent binaries downloaded from the ftp.gnome.org
- as described in the README.txt file in the build/win32/vs10 folder)
+ as described in the README.txt file in the build/win32/vs12 folder)
 -zlib
 -libpng
 -(for GDK-Pixbuf, if not using GDI+) IJG JPEG or libjpeg-turbo
@@ -64,7 +64,7 @@ The recommended build order for these dependencies:
  [libtiff requires zlib and IJG JPEG or libjpeg-turbo]
 -(for GDK-Pixbuf, if not using GDI+) jasper [jpeg-2000 library]
 -(optional for GLib) PCRE (version 8.12 or later, use of CMake to
-  build PCRE is recommended-see build/win32/vs10/README.txt of GLib)
+  build PCRE is recommended-see build/win32/vs12/README.txt of GLib)
 -GLib **
 -Cairo (inclusive of Cairo-GObject)
 -ATK**
@@ -74,10 +74,10 @@ The recommended build order for these dependencies:
  dependencies can be built in any order)
 
 The "install" project will copy build results and headers into their
-appropriate location under <root>\vs10\<PlatformName>. For instance,
-built DLLs go into <root>\vs10\<PlatformName>\bin, built LIBs into
-<root>\vs10\<PlatformName>\lib and GTK+ headers into
-<root>\vs10\<PlatformName>\include\gtk-3.0. This is then from where
+appropriate location under <root>\vs12\<PlatformName>. For instance,
+built DLLs go into <root>\vs12\<PlatformName>\bin, built LIBs into
+<root>\vs12\<PlatformName>\lib and GTK+ headers into
+<root>\vs12\<PlatformName>\include\gtk-3.0. This is then from where
 project files higher in the stack are supposed to look for them, not
 from a specific GLib source tree.
 
@@ -95,7 +95,7 @@ GTK+ section) on how to get those icons set up for use with GTK+.
  and Pango.
 
 **:Put the sources of the packages marked with ** in <root>\<package-
-    source-tree>, and build with VS10 from there.
+    source-tree>, and build with VS12 from there.
 
 --Tor Lillqvist <tml iki fi>
 --Updated by Chun-wei Fan <fanc999 yahoo com tw>
diff --git a/build/win32/vs10/broadwayd.vcxproj.filtersin b/build/win32/vs12/broadwayd.vcxproj.filtersin
similarity index 94%
rename from build/win32/vs10/broadwayd.vcxproj.filtersin
rename to build/win32/vs12/broadwayd.vcxproj.filtersin
index ad496bc..e26d87c 100644
--- a/build/win32/vs10/broadwayd.vcxproj.filtersin
+++ b/build/win32/vs12/broadwayd.vcxproj.filtersin
@@ -15,6 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-#include "broadwayd.vs10.sourcefiles.filters"
+#include "broadwayd.vs12.sourcefiles.filters"
   </ItemGroup>
 </Project>
diff --git a/build/win32/vs10/broadwayd.vcxprojin b/build/win32/vs12/broadwayd.vcxprojin
similarity index 97%
rename from build/win32/vs10/broadwayd.vcxprojin
rename to build/win32/vs12/broadwayd.vcxprojin
index 14c5759..6d8958e 100644
--- a/build/win32/vs10/broadwayd.vcxprojin
+++ b/build/win32/vs12/broadwayd.vcxprojin
@@ -28,23 +28,23 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -163,7 +163,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-#include "broadwayd.vs10.sourcefiles"
+#include "broadwayd.vs12.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gtk4-prebuild.vcxproj">
diff --git a/build/win32/vs10/gdk-4.vcxproj.filtersin b/build/win32/vs12/gdk-4.vcxproj.filtersin
similarity index 96%
rename from build/win32/vs10/gdk-4.vcxproj.filtersin
rename to build/win32/vs12/gdk-4.vcxproj.filtersin
index 6f24d8c..a6d1e92 100644
--- a/build/win32/vs10/gdk-4.vcxproj.filtersin
+++ b/build/win32/vs12/gdk-4.vcxproj.filtersin
@@ -18,7 +18,7 @@
     <ResourceCompile Include="..\..\..\gdk\win32\rc\gdk.rc"><Filter>Resource Files</Filter></ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-#include "gdk-4.vs10.sourcefiles.filters"
+#include "gdk-4.vs12.sourcefiles.filters"
     <ClCompile Include="..\..\..\gdk\gdkkeynames.c"><Filter>Source Files</Filter></ClCompile>
   </ItemGroup>
 </Project>
diff --git a/build/win32/vs10/gdk-4.vcxprojin b/build/win32/vs12/gdk-4.vcxprojin
similarity index 97%
rename from build/win32/vs10/gdk-4.vcxprojin
rename to build/win32/vs12/gdk-4.vcxprojin
index 109e387..c66d7f6 100644
--- a/build/win32/vs10/gdk-4.vcxprojin
+++ b/build/win32/vs12/gdk-4.vcxprojin
@@ -44,45 +44,45 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -314,7 +314,7 @@
     <ResourceCompile Include="..\..\..\gdk\win32\rc\gdk.rc" />
   </ItemGroup>
   <ItemGroup>
-#include "gdk-4.vs10.sourcefiles"
+#include "gdk-4.vs12.sourcefiles"
     <ClCompile Include="..\..\..\gdk\gdkkeynames.c" />
   </ItemGroup>
   <ItemGroup>
diff --git a/build/win32/vs10/gdk4-broadway.vcxproj.filtersin 
b/build/win32/vs12/gdk4-broadway.vcxproj.filtersin
similarity index 94%
rename from build/win32/vs10/gdk4-broadway.vcxproj.filtersin
rename to build/win32/vs12/gdk4-broadway.vcxproj.filtersin
index 8e7eae1..39231ac 100644
--- a/build/win32/vs10/gdk4-broadway.vcxproj.filtersin
+++ b/build/win32/vs12/gdk4-broadway.vcxproj.filtersin
@@ -15,6 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-#include "gdk4-broadway.vs10.sourcefiles.filters"
+#include "gdk4-broadway.vs12.sourcefiles.filters"
   </ItemGroup>
 </Project>
diff --git a/build/win32/vs10/gdk4-broadway.vcxprojin b/build/win32/vs12/gdk4-broadway.vcxprojin
similarity index 96%
rename from build/win32/vs10/gdk4-broadway.vcxprojin
rename to build/win32/vs12/gdk4-broadway.vcxprojin
index c88e5c6..dcf4a48 100644
--- a/build/win32/vs10/gdk4-broadway.vcxprojin
+++ b/build/win32/vs12/gdk4-broadway.vcxprojin
@@ -28,23 +28,23 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -117,7 +117,7 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-#include "gdk4-broadway.vs10.sourcefiles"
+#include "gdk4-broadway.vs12.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gtk4-prebuild.vcxproj">
diff --git a/build/win32/vs10/gdk4-win32.vcxproj.filtersin b/build/win32/vs12/gdk4-win32.vcxproj.filtersin
similarity index 94%
rename from build/win32/vs10/gdk4-win32.vcxproj.filtersin
rename to build/win32/vs12/gdk4-win32.vcxproj.filtersin
index 36ba1ca..3f36439 100644
--- a/build/win32/vs10/gdk4-win32.vcxproj.filtersin
+++ b/build/win32/vs12/gdk4-win32.vcxproj.filtersin
@@ -15,6 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-#include "gdk4-win32.vs10.sourcefiles.filters"
+#include "gdk4-win32.vs12.sourcefiles.filters"
   </ItemGroup>
 </Project>
diff --git a/build/win32/vs10/gdk4-win32.vcxprojin b/build/win32/vs12/gdk4-win32.vcxprojin
similarity index 96%
rename from build/win32/vs10/gdk4-win32.vcxprojin
rename to build/win32/vs12/gdk4-win32.vcxprojin
index 0030883..4963618 100644
--- a/build/win32/vs10/gdk4-win32.vcxprojin
+++ b/build/win32/vs12/gdk4-win32.vcxprojin
@@ -28,23 +28,23 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -117,7 +117,7 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-#include "gdk4-win32.vs10.sourcefiles"
+#include "gdk4-win32.vs12.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gtk4-prebuild.vcxproj">
diff --git a/build/win32/vs10/gtk+-4.sln b/build/win32/vs12/gtk+-4.sln
similarity index 98%
rename from build/win32/vs10/gtk+-4.sln
rename to build/win32/vs12/gtk+-4.sln
index 7b784d1..6c18434 100644
--- a/build/win32/vs10/gtk+-4.sln
+++ b/build/win32/vs12/gtk+-4.sln
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-prebuild", "gtk4-prebuild.vcxproj", 
"{B98FBE68-B03C-48E3-8F32-C3C010720D30}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk4-win32", "gdk4-win32.vcxproj", 
"{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}"
diff --git a/build/win32/vs10/gtk-4.vcxproj.filtersin b/build/win32/vs12/gtk-4.vcxproj.filtersin
similarity index 98%
rename from build/win32/vs10/gtk-4.vcxproj.filtersin
rename to build/win32/vs12/gtk-4.vcxproj.filtersin
index 33162a2..1b541bb 100644
--- a/build/win32/vs10/gtk-4.vcxproj.filtersin
+++ b/build/win32/vs12/gtk-4.vcxproj.filtersin
@@ -23,7 +23,7 @@
     <CustomBuild Include="..\..\..\gtk\libgtk4.manifest.in"><Filter>Resource Files</Filter></CustomBuild>
   </ItemGroup>
   <ItemGroup>
-#include "gtk-4.vs10.sourcefiles.filters"
+#include "gtk-4.vs12.sourcefiles.filters"
     <ClCompile Include="..\..\..\modules\input\gtkimcontextime.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\modules\input\gtkimcontextmultipress.c"><Filter>Source 
Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\modules\input\gtkimcontextthai.c"><Filter>Source Files</Filter></ClCompile>
diff --git a/build/win32/vs10/gtk-4.vcxprojin b/build/win32/vs12/gtk-4.vcxprojin
similarity index 98%
rename from build/win32/vs10/gtk-4.vcxprojin
rename to build/win32/vs12/gtk-4.vcxprojin
index 86b98b5..f32094e 100644
--- a/build/win32/vs10/gtk-4.vcxprojin
+++ b/build/win32/vs12/gtk-4.vcxprojin
@@ -29,22 +29,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -210,7 +210,7 @@
     <ResourceCompile Include="..\..\..\gtk\gtk-win32.rc" />
   </ItemGroup>
   <ItemGroup>
-#include "gtk-4.vs10.sourcefiles"
+#include "gtk-4.vs12.sourcefiles"
     <ClCompile Include="..\..\..\modules\input\gtkimcontextime.c" />
     <ClCompile Include="..\..\..\modules\input\gtkimcontextmultipress.c" />
     <ClCompile Include="..\..\..\modules\input\gtkimcontextthai.c" />
diff --git a/build/win32/vs10/gtk-builder-tool.vcxproj b/build/win32/vs12/gtk-builder-tool.vcxproj
similarity index 98%
rename from build/win32/vs10/gtk-builder-tool.vcxproj
rename to build/win32/vs12/gtk-builder-tool.vcxproj
index e5771d2..0c2ce14 100644
--- a/build/win32/vs10/gtk-builder-tool.vcxproj
+++ b/build/win32/vs12/gtk-builder-tool.vcxproj
@@ -28,23 +28,23 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/build/win32/vs10/gtk-builder-tool.vcxproj.filters 
b/build/win32/vs12/gtk-builder-tool.vcxproj.filters
similarity index 100%
rename from build/win32/vs10/gtk-builder-tool.vcxproj.filters
rename to build/win32/vs12/gtk-builder-tool.vcxproj.filters
diff --git a/build/win32/vs10/gtk-encode-symbolic-svg.vcxproj 
b/build/win32/vs12/gtk-encode-symbolic-svg.vcxproj
similarity index 98%
rename from build/win32/vs10/gtk-encode-symbolic-svg.vcxproj
rename to build/win32/vs12/gtk-encode-symbolic-svg.vcxproj
index b910be5..a424f8b 100644
--- a/build/win32/vs10/gtk-encode-symbolic-svg.vcxproj
+++ b/build/win32/vs12/gtk-encode-symbolic-svg.vcxproj
@@ -28,23 +28,23 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/build/win32/vs10/gtk-encode-symbolic-svg.vcxproj.filters 
b/build/win32/vs12/gtk-encode-symbolic-svg.vcxproj.filters
similarity index 100%
rename from build/win32/vs10/gtk-encode-symbolic-svg.vcxproj.filters
rename to build/win32/vs12/gtk-encode-symbolic-svg.vcxproj.filters
diff --git a/build/win32/vs10/gtk-query-settings.vcxproj b/build/win32/vs12/gtk-query-settings.vcxproj
similarity index 98%
rename from build/win32/vs10/gtk-query-settings.vcxproj
rename to build/win32/vs12/gtk-query-settings.vcxproj
index 8dd75d7..9514793 100644
--- a/build/win32/vs10/gtk-query-settings.vcxproj
+++ b/build/win32/vs12/gtk-query-settings.vcxproj
@@ -28,23 +28,23 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/build/win32/vs10/gtk-query-settings.vcxproj.filters 
b/build/win32/vs12/gtk-query-settings.vcxproj.filters
similarity index 100%
rename from build/win32/vs10/gtk-query-settings.vcxproj.filters
rename to build/win32/vs12/gtk-query-settings.vcxproj.filters
diff --git a/build/win32/vs10/gtk-update-icon-cache.vcxproj b/build/win32/vs12/gtk-update-icon-cache.vcxproj
similarity index 98%
rename from build/win32/vs10/gtk-update-icon-cache.vcxproj
rename to build/win32/vs12/gtk-update-icon-cache.vcxproj
index 505b3fe..509f5a7 100644
--- a/build/win32/vs10/gtk-update-icon-cache.vcxproj
+++ b/build/win32/vs12/gtk-update-icon-cache.vcxproj
@@ -28,23 +28,23 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/build/win32/vs10/gtk-update-icon-cache.vcxproj.filters 
b/build/win32/vs12/gtk-update-icon-cache.vcxproj.filters
similarity index 100%
rename from build/win32/vs10/gtk-update-icon-cache.vcxproj.filters
rename to build/win32/vs12/gtk-update-icon-cache.vcxproj.filters
diff --git a/build/win32/vs10/gtk4-build-defines.props b/build/win32/vs12/gtk4-build-defines.props
similarity index 100%
rename from build/win32/vs10/gtk4-build-defines.props
rename to build/win32/vs12/gtk4-build-defines.props
diff --git a/build/win32/vs10/gtk4-copy-gdk-broadway.props b/build/win32/vs12/gtk4-copy-gdk-broadway.props
similarity index 100%
rename from build/win32/vs10/gtk4-copy-gdk-broadway.props
rename to build/win32/vs12/gtk4-copy-gdk-broadway.props
diff --git a/build/win32/vs10/gtk4-demo-application.vcxproj.filtersin 
b/build/win32/vs12/gtk4-demo-application.vcxproj.filtersin
similarity index 93%
rename from build/win32/vs10/gtk4-demo-application.vcxproj.filtersin
rename to build/win32/vs12/gtk4-demo-application.vcxproj.filtersin
index 4631343..5d39916 100644
--- a/build/win32/vs10/gtk4-demo-application.vcxproj.filtersin
+++ b/build/win32/vs12/gtk4-demo-application.vcxproj.filtersin
@@ -15,6 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-#include "gtk4-demo-application.vs10.sourcefiles.filters"
+#include "gtk4-demo-application.vs12.sourcefiles.filters"
   </ItemGroup>
 </Project>
diff --git a/build/win32/vs10/gtk4-demo-application.vcxprojin 
b/build/win32/vs12/gtk4-demo-application.vcxprojin
similarity index 97%
rename from build/win32/vs10/gtk4-demo-application.vcxprojin
rename to build/win32/vs12/gtk4-demo-application.vcxprojin
index 7bd290b..f5ed864 100644
--- a/build/win32/vs10/gtk4-demo-application.vcxprojin
+++ b/build/win32/vs12/gtk4-demo-application.vcxprojin
@@ -28,23 +28,23 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -155,7 +155,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-#include "gtk4-demo-application.vs10.sourcefiles"
+#include "gtk4-demo-application.vs12.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk-4.vcxproj">
diff --git a/build/win32/vs10/gtk4-demo.vcxproj.filtersin b/build/win32/vs12/gtk4-demo.vcxproj.filtersin
similarity index 92%
rename from build/win32/vs10/gtk4-demo.vcxproj.filtersin
rename to build/win32/vs12/gtk4-demo.vcxproj.filtersin
index 7ffdcf6..37f1af4 100644
--- a/build/win32/vs10/gtk4-demo.vcxproj.filtersin
+++ b/build/win32/vs12/gtk4-demo.vcxproj.filtersin
@@ -11,6 +11,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-#include "gtk4-demo.vs10.sourcefiles.filters"
+#include "gtk4-demo.vs12.sourcefiles.filters"
   </ItemGroup>
 </Project>
diff --git a/build/win32/vs10/gtk4-demo.vcxprojin b/build/win32/vs12/gtk4-demo.vcxprojin
similarity index 97%
rename from build/win32/vs10/gtk4-demo.vcxprojin
rename to build/win32/vs12/gtk4-demo.vcxprojin
index 31df52c..3022f41 100644
--- a/build/win32/vs10/gtk4-demo.vcxprojin
+++ b/build/win32/vs12/gtk4-demo.vcxprojin
@@ -28,23 +28,23 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -169,7 +169,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-#include "gtk4-demo.vs10.sourcefiles"
+#include "gtk4-demo.vs12.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk-4.vcxproj">
diff --git a/build/win32/vs10/gtk4-gen-srcs.props b/build/win32/vs12/gtk4-gen-srcs.props
similarity index 100%
rename from build/win32/vs10/gtk4-gen-srcs.props
rename to build/win32/vs12/gtk4-gen-srcs.props
diff --git a/build/win32/vs10/gtk4-icon-browser.vcxproj.filtersin 
b/build/win32/vs12/gtk4-icon-browser.vcxproj.filtersin
similarity index 93%
rename from build/win32/vs10/gtk4-icon-browser.vcxproj.filtersin
rename to build/win32/vs12/gtk4-icon-browser.vcxproj.filtersin
index 4ff5822..3350174 100644
--- a/build/win32/vs10/gtk4-icon-browser.vcxproj.filtersin
+++ b/build/win32/vs12/gtk4-icon-browser.vcxproj.filtersin
@@ -15,6 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-#include "gtk4-icon-browser.vs10.sourcefiles.filters"
+#include "gtk4-icon-browser.vs12.sourcefiles.filters"
   </ItemGroup>
 </Project>
diff --git a/build/win32/vs10/gtk4-icon-browser.vcxprojin b/build/win32/vs12/gtk4-icon-browser.vcxprojin
similarity index 97%
rename from build/win32/vs10/gtk4-icon-browser.vcxprojin
rename to build/win32/vs12/gtk4-icon-browser.vcxprojin
index 4c254db..01015a0 100644
--- a/build/win32/vs10/gtk4-icon-browser.vcxprojin
+++ b/build/win32/vs12/gtk4-icon-browser.vcxprojin
@@ -28,23 +28,23 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -159,7 +159,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-#include "gtk4-icon-browser.vs10.sourcefiles"
+#include "gtk4-icon-browser.vs12.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk-4.vcxproj">
diff --git a/build/win32/vs10/gtk4-ignore-broadway.props b/build/win32/vs12/gtk4-ignore-broadway.props
similarity index 100%
rename from build/win32/vs10/gtk4-ignore-broadway.props
rename to build/win32/vs12/gtk4-ignore-broadway.props
diff --git a/build/win32/vs10/gtk4-install.propsin b/build/win32/vs12/gtk4-install.propsin
similarity index 98%
rename from build/win32/vs10/gtk4-install.propsin
rename to build/win32/vs12/gtk4-install.propsin
index 1b6d6c9..a69fa12 100644
--- a/build/win32/vs10/gtk4-install.propsin
+++ b/build/win32/vs12/gtk4-install.propsin
@@ -94,12 +94,12 @@ echo off
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated
 copy ..\..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
-#include "gdk-4.vs10.headers"
-#include "gdk4-win32.vs10.headers"
+#include "gdk-4.vs12.headers"
+#include "gdk4-win32.vs12.headers"
 
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
-#include "gtk-4.vs10.headers"
+#include "gtk-4.vs12.headers"
 
 mkdir $(CopyDir)\share\icons\hicolor\16x16\apps
 copy ..\..\..\demos\gtk-demo\data\16x16\gtk4-demo.png $(CopyDir)\share\icons\hicolor\16x16\apps
@@ -122,7 +122,7 @@ copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\
     <GtkDoInstallBroadwayHeaders>
 copy ..\..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway
-#include "gdk4-broadway.vs10.headers"
+#include "gdk4-broadway.vs12.headers"
     </GtkDoInstallBroadwayHeaders>
     <GtkPostInstall>
 echo "Compiling gsettings XML Files..."
diff --git a/build/win32/vs10/gtk4-install.vcxproj b/build/win32/vs12/gtk4-install.vcxproj
similarity index 98%
rename from build/win32/vs10/gtk4-install.vcxproj
rename to build/win32/vs12/gtk4-install.vcxproj
index 70b89e2..5c9f12d 100644
--- a/build/win32/vs10/gtk4-install.vcxproj
+++ b/build/win32/vs12/gtk4-install.vcxproj
@@ -44,45 +44,45 @@
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/build/win32/vs10/gtk4-install.vcxproj.filters b/build/win32/vs12/gtk4-install.vcxproj.filters
similarity index 100%
rename from build/win32/vs10/gtk4-install.vcxproj.filters
rename to build/win32/vs12/gtk4-install.vcxproj.filters
diff --git a/build/win32/vs10/gtk4-prebuild.vcxproj b/build/win32/vs12/gtk4-prebuild.vcxproj
similarity index 98%
rename from build/win32/vs10/gtk4-prebuild.vcxproj
rename to build/win32/vs12/gtk4-prebuild.vcxproj
index d68bfe8..d49f59d 100644
--- a/build/win32/vs10/gtk4-prebuild.vcxproj
+++ b/build/win32/vs12/gtk4-prebuild.vcxproj
@@ -44,45 +44,45 @@
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/build/win32/vs10/gtk4-prebuild.vcxproj.filters b/build/win32/vs12/gtk4-prebuild.vcxproj.filters
similarity index 100%
rename from build/win32/vs10/gtk4-prebuild.vcxproj.filters
rename to build/win32/vs12/gtk4-prebuild.vcxproj.filters
diff --git a/build/win32/vs10/gtk4-version-paths.props.in b/build/win32/vs12/gtk4-version-paths.props.in
similarity index 99%
rename from build/win32/vs10/gtk4-version-paths.props.in
rename to build/win32/vs12/gtk4-version-paths.props.in
index fb74684..8d16191 100644
--- a/build/win32/vs10/gtk4-version-paths.props.in
+++ b/build/win32/vs12/gtk4-version-paths.props.in
@@ -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>10</VSVer>
+    <VSVer>12</VSVer>
     <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
     <CopyDir>..\..\..\..\vs$(VSVer)\$(Platform)</CopyDir>
     <ApiVersion>4.0</ApiVersion>
diff --git a/build/win32/vs14/Makefile.am b/build/win32/vs14/Makefile.am
index dc0625c..917d2b4 100644
--- a/build/win32/vs14/Makefile.am
+++ b/build/win32/vs14/Makefile.am
@@ -40,6 +40,8 @@ EXTRA_DIST += \
 
 DISTCLEANFILES = $(EXTRA_DIST)
 
+MSVC_BASE_VER = 12
+MSVC_BASE_VER_LONG = 2013
 MSVC_VER = 14
 MSVC_FORMAT_VER = 12
 MSVC_VER_LONG = 14
diff --git a/configure.ac b/configure.ac
index f93c2d3..e2425f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1993,12 +1993,8 @@ docs/reference/gtk/version.xml
 docs/tools/Makefile
 build/Makefile
 build/win32/Makefile
-build/win32/vs9/Makefile
-build/win32/vs9/gtk4-version-paths.vsprops
-build/win32/vs10/Makefile
-build/win32/vs10/gtk4-version-paths.props
-build/win32/vs11/Makefile
 build/win32/vs12/Makefile
+build/win32/vs12/gtk4-version-paths.props
 build/win32/vs14/Makefile
 gdk/Makefile
 gdk/broadway/Makefile
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index b873418..beb88a8 100644
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -194,8 +194,8 @@ gtk4_demo_application_EXCLUDES = dummy
 include $(top_srcdir)/build/Makefile.msvcproj
 
 dist-hook: \
-       $(top_builddir)/build/win32/vs9/gtk4-demo.vcproj        \
-       $(top_builddir)/build/win32/vs9/gtk4-demo-application.vcproj
+       $(top_builddir)/build/win32/vs12/gtk4-demo.vcxproj      \
+       $(top_builddir)/build/win32/vs12/gtk4-demo-application.vcxproj
 
 DISTCLEANFILES = demos.h demos.h.win32
 
diff --git a/demos/icon-browser/Makefile.am b/demos/icon-browser/Makefile.am
index 111ce35..8a2722b 100644
--- a/demos/icon-browser/Makefile.am
+++ b/demos/icon-browser/Makefile.am
@@ -43,6 +43,6 @@ gtk4_icon_browser_EXCLUDES = dummy
 
 include $(top_srcdir)/build/Makefile.msvcproj
 
-dist-hook: $(top_builddir)/build/win32/vs9/gtk4-icon-browser.vcproj
+dist-hook: $(top_builddir)/build/win32/vs12/gtk4-icon-browser.vcxproj
 
 -include $(top_srcdir)/git.mk
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 538d113..b31e7e2 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -546,8 +546,8 @@ INTROSPECTION_INTERMEDIATE_ITEMS =
 endif
 
 dist-hook: \
-       $(top_builddir)/build/win32/vs9/gdk-4.vcproj    \
-       $(top_builddir)/build/win32/vs9/gdk-4.headers   \
+       $(top_builddir)/build/win32/vs12/gdk-4.vcxproj  \
+       $(top_builddir)/build/win32/vs12/gdk-4.vs12.headers     \
        $(INTROSPECTION_INTERMEDIATE_ITEMS)
 
 DISTCLEANFILES = gdkconfig.h stamp-gc-h
diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am
index 3420865..97b790d 100644
--- a/gdk/broadway/Makefile.am
+++ b/gdk/broadway/Makefile.am
@@ -124,8 +124,8 @@ broadwayd_EXCLUDES = dummy
 include $(top_srcdir)/build/Makefile.msvcproj
 
 dist-hook: \
-       $(top_builddir)/build/win32/vs9/gdk4-broadway.vcproj            \
-       $(top_builddir)/build/win32/vs9/broadwayd.vcproj                \
-       $(top_builddir)/build/win32/vs9/gdk4-broadway.headers
+       $(top_builddir)/build/win32/vs12/gdk4-broadway.vcxproj          \
+       $(top_builddir)/build/win32/vs12/broadwayd.vcxproj              \
+       $(top_builddir)/build/win32/vs12/gdk4-broadway.vs12.headers
 
 -include $(top_srcdir)/git.mk
diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
index 2b89eea..ebd4ae6 100644
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@@ -101,7 +101,7 @@ gdk4_win32_HEADERS_EXCLUDES = dummy
 include $(top_srcdir)/build/Makefile.msvcproj
 
 dist-hook: \
-       $(top_builddir)/build/win32/vs9/gdk4-win32.vcproj       \
-       $(top_builddir)/build/win32/vs9/gdk4-win32.headers
+       $(top_builddir)/build/win32/vs12/gdk4-win32.vcxproj     \
+       $(top_builddir)/build/win32/vs12/gdk4-win32.vs12.headers
 
 -include $(top_srcdir)/git.mk
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 356523f..b83cc3b 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1479,8 +1479,8 @@ INTROSPECTION_INTERMEDIATE_ITEMS =
 endif
 
 dist-hook: \
-       $(top_builddir)/build/win32/vs9/gtk-4.vcproj    \
-       $(top_builddir)/build/win32/vs9/gtk-4.headers   \
+       $(top_builddir)/build/win32/vs12/gtk-4.vcxproj  \
+       $(top_builddir)/build/win32/vs12/gtk-4.vs12.headers     \
        $(INTROSPECTION_INTERMEDIATE_ITEMS)
 
 # Install a RC file for the default GTK+ theme, and key themes

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]