GNOME.org
 

[librsvg/rustification] MSVC builds: Make MSVC 2013 the baseline MSVC Version

commit 49ae87e22aa0bb5bfdb199e659989b833193c78f
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Dec 16 14:53:37 2016 +0800

    MSVC builds: Make MSVC 2013 the baseline MSVC Version
    
    Due to the rustification of librsvg, it is now only possible to support Visual
    Studio 2013 and later as the Rust compiler will require items from the CRT
    during linking that is provided by the MSVC 2013 (and later) CRTs.
    
    As a result, drop the Visual Studio 2008~2012 projects, and we no longer need
    a fallback math.h implementation since these are now covered by the CRT
    implementation.

 Makefile.am                                        |    6 +-
 build/Makefile-newvs.am                            |   30 ++--
 build/Makefile.msvcproj                            |   33 ++++
 build/win32/Makefile.am                            |    7 +-
 build/win32/vs10/Makefile.am                       |   39 ----
 build/win32/vs11/Makefile.am                       |   28 ---
 build/win32/vs12/Makefile.am                       |   33 ++--
 build/win32/{vs10 => vs12}/README.txt              |   38 ++--
 .../{vs10 => vs12}/libpixbufloader-svg.vcxproj     |    8 +-
 .../libpixbufloader-svg.vcxproj.filters            |    0
 build/win32/{vs10 => vs12}/librsvg.sln             |    4 +-
 .../win32/{vs10 => vs12}/rsvg-build-defines.props  |    0
 .../{vs10 => vs12}/rsvg-convert.vcxproj.filtersin  |    2 +-
 build/win32/{vs10 => vs12}/rsvg-convert.vcxprojin  |   10 +-
 build/win32/{vs10 => vs12}/rsvg-gen-srcs.props     |    0
 build/win32/{vs10 => vs12}/rsvg-install.propsin    |    2 +-
 build/win32/{vs10 => vs12}/rsvg-install.vcxproj    |    8 +-
 .../win32/{vs10 => vs12}/rsvg-version-paths.props  |    2 +-
 build/win32/{vs10 => vs12}/rsvg-view-3.vcxproj     |    8 +-
 .../{vs10 => vs12}/rsvg-view-3.vcxproj.filters     |    0
 build/win32/{vs10 => vs12}/rsvg.vcxproj.filtersin  |    2 +-
 build/win32/{vs10 => vs12}/rsvg.vcxprojin          |   10 +-
 build/win32/vs14/Makefile.am                       |    2 +
 build/win32/vs9/Makefile.am                        |   27 ---
 build/win32/vs9/README.txt                         |   74 --------
 build/win32/vs9/libpixbufloader-svg.vcproj         |  170 -----------------
 build/win32/vs9/librsvg.sln                        |   81 --------
 build/win32/vs9/math.h                             |   39 ----
 build/win32/vs9/rsvg-build-defines.vsprops         |   50 -----
 build/win32/vs9/rsvg-convert.vcprojin              |  167 -----------------
 build/win32/vs9/rsvg-gen-srcs.vsprops              |   19 --
 build/win32/vs9/rsvg-install.vcproj                |   74 --------
 build/win32/vs9/rsvg-install.vspropsin             |   34 ----
 build/win32/vs9/rsvg-version-paths.vsprops         |   53 ------
 build/win32/vs9/rsvg-view-3.vcproj                 |  170 -----------------
 build/win32/vs9/rsvg.vcprojin                      |  198 --------------------
 configure.ac                                       |    3 -
 37 files changed, 123 insertions(+), 1308 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 1b81ab4..c72f6a7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -326,8 +326,8 @@ include $(top_srcdir)/build/Makefile.msvcproj
 
 # autotools: Why must we do this instead of dist-hook?
 MSVCPROJ_GENERATED = \
-       $(top_builddir)/build/win32/vs9/rsvg.vcproj             \
-       $(top_builddir)/build/win32/vs9/rsvg-convert.vcproj
+       $(top_builddir)/build/win32/vs12/rsvg.vcxproj           \
+       $(top_builddir)/build/win32/vs12/rsvg-convert.vcxproj
 
 if HAVE_INTROSPECTION
 
@@ -350,7 +350,7 @@ MSVCPROJ_GENERATED += $(INTROSPECTION_INTERMEDIATE_ITEMS)
 include $(top_srcdir)/build/Makefile.msvc-introspection
 endif # HAVE_INTROSPECTION
 
-$(MSVCPROJ_GENERATED): $(top_builddir)/build/win32/vs9/rsvg.headers
+$(MSVCPROJ_GENERATED): $(top_builddir)/build/win32/vs12/rsvg.vs12.headers
 
 EXTRA_DIST += $(MSVCPROJ_GENERATED)
 
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/Makefile.msvcproj b/build/Makefile.msvcproj
index f127eea..2a2dd89 100644
--- a/build/Makefile.msvcproj
+++ b/build/Makefile.msvcproj
@@ -109,6 +109,39 @@ $(top_builddir)/build/win32/vs9/$(1).headers: Makefile
                esac;   \
        done
 
+$(top_builddir)/build/win32/vs12/$(1).vcxproj.filters: $(top_builddir)/build/win32/vs12/$(1).vcxproj
+
+$(top_builddir)/build/win32/vs12/$(1).vcxproj: Makefile
+       -$(RM) $(top_builddir)/build/win32/vs14/$(1).vcxproj
+       -$(RM) $(top_builddir)/build/win32/vs14/$(1).vcxproj.filters
+
+       for F in $(_proj_files); do \
+               case $$$$F in \
+               $(_proj_filters)) \
+                       ;; \
+               *.c|*.cpp|*.cc|*.cxx) \
+                       echo '   <ClCompile Include="..\..\..'$(_proj_subdir)$$$$F'" />' 

$(1).vs12.sourcefiles && \

+                       echo '   <ClCompile Include="..\..\..'$(_proj_subdir)$$$$F'"><Filter>Source 
Files</Filter></ClCompile>' >>$(1).vs12.sourcefiles.filters \
+                       ;; \
+               esac;   \
+       done
+
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs12/$(1).vcxprojin 

$(top_builddir)/build/win32/vs12/$(1).vcxproj

+       $(CPP) -P - <$(top_srcdir)/build/win32/vs12/$(1).vcxproj.filtersin 

$(top_builddir)/build/win32/vs12/$(1).vcxproj.filters

+
+$(top_builddir)/build/win32/vs12/$(1).vs12.headers: Makefile
+       -$(RM) $(top_builddir)/build/win32/vs12/$(1).vs12.headers
+
+       for F in $(_proj_headers); do \
+               case $$$$F in \
+               $(_proj_headers_excludes)) \
+                       ;; \
+               *.h|*.hpp|*.hh|*.hxx) \
+                       echo 'copy ..\..\..'$(_proj_subdir)$$$$F' 
$$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/build/win32/vs12/$(1).vs12.headers \
+                       ;; \
+               esac;   \
+       done
+
 endef
 
 $(foreach proj,$(MSVCPROJS),$(eval $(call msvcproj-builder,$(proj))))
diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am
index a839e54..63e4b84 100644
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -1,9 +1,4 @@
-SUBDIRS = \
-       vs9     \
-       vs10    \
-       vs11    \
-       vs12    \
-       vs14
+SUBDIRS = vs12 vs14
 
 if HAVE_INTROSPECTION
 GENERATED_ITEMS = \
diff --git a/build/win32/vs12/Makefile.am b/build/win32/vs12/Makefile.am
index 6b350fa..5108071 100644
--- a/build/win32/vs12/Makefile.am
+++ b/build/win32/vs12/Makefile.am
@@ -1,24 +1,33 @@
-EXTRA_DIST =    \
+GENERATED_ITEMS =                      \
+       rsvg.vcxproj                    \
+       rsvg.vcxproj.filters            \
+       rsvg-convert.vcxproj            \
+       rsvg-convert.vcxproj.filters    \
+       rsvg-install.props
+
+EXTRA_DIST =   \
        librsvg.sln                             \
        rsvg-build-defines.props                \
        rsvg-gen-srcs.props                     \
-       rsvg-install.props                      \
+       rsvg-install.propsin                    \
        rsvg-version-paths.props                \
        libpixbufloader-svg.vcxproj             \
        libpixbufloader-svg.vcxproj.filters     \
-       rsvg.vcxproj                            \
-       rsvg.vcxproj.filters                    \
-       rsvg-convert.vcxproj                    \
-       rsvg-convert.vcxproj.filters            \
+       rsvg.vcxprojin                          \
+       rsvg.vcxproj.filtersin                  \
+       rsvg-convert.vcxprojin                  \
+       rsvg-convert.vcxproj.filtersin          \
        rsvg-install.vcxproj                    \
        rsvg-view-3.vcxproj                     \
        rsvg-view-3.vcxproj.filters             \
-       README.txt 
+       README.txt                              \
+       $(GENERATED_ITEMS)
 
-DISTCLEANFILES = $(EXTRA_DIST)
+rsvg-install.props: $(top_srcdir)/build/win32/vs12/rsvg-install.propsin rsvg.vs12.headers
+       -$(RM) $(top_builddir)/build/win32/vs14/rsvg-install.props
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs12/rsvg-install.propsin >$@
+       rm rsvg.vs12.headers
 
-MSVC_VER = 12
-MSVC_FORMAT_VER = 12
-MSVC_VER_LONG = 2013
+DISTCLEANFILES = $(GENERATED_ITEMS)
 
-include $(top_srcdir)/build/Makefile-newvs.am
+-include $(top_srcdir)/git.mk
diff --git a/build/win32/vs10/README.txt b/build/win32/vs12/README.txt
similarity index 66%
rename from build/win32/vs10/README.txt
rename to build/win32/vs12/README.txt
index 054e3c5..0fbf991 100644
--- a/build/win32/vs10/README.txt
+++ b/build/win32/vs12/README.txt
@@ -9,46 +9,46 @@ instructions on building librsvg and its dependencies with Visual C++:
 
 https://live.gnome.org/GTK%2B/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 librsvg source tree unpacked from a tarball. In a git checkout you
 first need to use some Unix-like environment or manual work to expand
 files as needed, for instance the .vcprojin files here into .vcproj
 files.
 
 It is recommended that GLib, libxml2, libcroco, Cairo, Pango is compiled
-with VS10 to compile librsvg.
+with VS12 to compile librsvg.
 
 External dependencies are at least Cairo, GLib, libxml2, libcroco, GDK-Pixbuf
-Please see the build\win32\vs10\README.txt file in glib for details where to
+Please see the build\win32\vs12\README.txt file in glib for details where to
 unpack them.
 
-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. GDK-Pixbuf,
 Pango, GLib and Cairo), so that crashes caused by mixing calls to different
 CRTs can be kept at a minimum.
 
-libxml2 and Cairo do contain support for compiling under VS10
+libxml2 and Cairo do contain support for compiling under VS12
 using VS project files and/or makefiles at this time of writing.
-For GDK-Pixbuf, Pango, libcroco and GLib, VS10 project files are
-available under $(srcroot)\build\vs10.
+For GDK-Pixbuf, Pango, libcroco and GLib, VS12 project files are
+available under $(srcroot)\build\vs12.
 
 Set up the source tree as follows under some arbitrary top folder
 <root>:
 
 <root>\<this-librsvg-source-tree>
-<root>\vs10\<PlatformName>
+<root>\vs12\<PlatformName>
 
 Note: put the resulting Cairo and libxml2 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:
 -libxml2
 -(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 (put the sources in <root>\<GLib-Source-Tree>, and build it from
-       there with VS10)
+       there with VS12)
 -libcroco
 -Cairo
 -Pango
@@ -56,15 +56,15 @@ The recommended build order for these dependencies:
 -ATK and GTK (Version 3.10+, if building the GTK+ viewer program)
 
 *this* file you are now reading is thus located at
-<root>\<this-librsvg-source-tree>\build\win32\vs10\README.txt.
+<root>\<this-librsvg-source-tree>\build\win32\vs12\README.txt.
 
-<PlatformName> is either Win32 or x64, as in VS10 project files.
+<PlatformName> is either Win32 or x64, as in VS12 project files.
 
 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 headers into
-<root>\vs10\<PlatformName>\include\librsvg-2.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 headers into
+<root>\vs12\<PlatformName>\include\librsvg-2.0. This is then from where
 project files higher in the stack are supposed to look for them, not
 from a specific librsvg source tree like this one. It is important to
 keep separate the concept of a "source tree", where also non-public
diff --git a/build/win32/vs10/libpixbufloader-svg.vcxproj b/build/win32/vs12/libpixbufloader-svg.vcxproj
similarity index 98%
rename from build/win32/vs10/libpixbufloader-svg.vcxproj
rename to build/win32/vs12/libpixbufloader-svg.vcxproj
index 6b14cd7..a56a8c9 100644
--- a/build/win32/vs10/libpixbufloader-svg.vcxproj
+++ b/build/win32/vs12/libpixbufloader-svg.vcxproj
@@ -26,24 +26,24 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
diff --git a/build/win32/vs10/libpixbufloader-svg.vcxproj.filters 
b/build/win32/vs12/libpixbufloader-svg.vcxproj.filters
similarity index 100%
rename from build/win32/vs10/libpixbufloader-svg.vcxproj.filters
rename to build/win32/vs12/libpixbufloader-svg.vcxproj.filters
diff --git a/build/win32/vs10/librsvg.sln b/build/win32/vs12/librsvg.sln
similarity index 96%
rename from build/win32/vs10/librsvg.sln
rename to build/win32/vs12/librsvg.sln
index b3c7374..1871cff 100644
--- a/build/win32/vs10/librsvg.sln
+++ b/build/win32/vs12/librsvg.sln
@@ -1,6 +1,6 @@
 
-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}") = "rsvg", "rsvg.vcxproj", 
"{3D7EF762-D969-4AC0-AB52-3CC86FA4620B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rsvg-convert", "rsvg-convert.vcxproj", 
"{039282C3-B73E-4D08-9B65-2034CF9EB4B7}"
diff --git a/build/win32/vs10/rsvg-build-defines.props b/build/win32/vs12/rsvg-build-defines.props
similarity index 100%
rename from build/win32/vs10/rsvg-build-defines.props
rename to build/win32/vs12/rsvg-build-defines.props
diff --git a/build/win32/vs10/rsvg-convert.vcxproj.filtersin b/build/win32/vs12/rsvg-convert.vcxproj.filtersin
similarity index 94%
rename from build/win32/vs10/rsvg-convert.vcxproj.filtersin
rename to build/win32/vs12/rsvg-convert.vcxproj.filtersin
index 49ab959..24f7735 100644
--- a/build/win32/vs10/rsvg-convert.vcxproj.filtersin
+++ b/build/win32/vs12/rsvg-convert.vcxproj.filtersin
@@ -15,6 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-#include "rsvg-convert.vs10.sourcefiles.filters"
+#include "rsvg-convert.vs12.sourcefiles.filters"
   </ItemGroup>
 </Project>
diff --git a/build/win32/vs10/rsvg-convert.vcxprojin b/build/win32/vs12/rsvg-convert.vcxprojin
similarity index 97%
rename from build/win32/vs10/rsvg-convert.vcxprojin
rename to build/win32/vs12/rsvg-convert.vcxprojin
index 6d8c9a1..8ed9162 100644
--- a/build/win32/vs10/rsvg-convert.vcxprojin
+++ b/build/win32/vs12/rsvg-convert.vcxprojin
@@ -26,24 +26,24 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -160,7 +160,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
 
-#include "rsvg-convert.vs10.sourcefiles"
+#include "rsvg-convert.vs12.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="rsvg.vcxproj">
diff --git a/build/win32/vs10/rsvg-gen-srcs.props b/build/win32/vs12/rsvg-gen-srcs.props
similarity index 100%
rename from build/win32/vs10/rsvg-gen-srcs.props
rename to build/win32/vs12/rsvg-gen-srcs.props
diff --git a/build/win32/vs10/rsvg-install.propsin b/build/win32/vs12/rsvg-install.propsin
similarity index 98%
rename from build/win32/vs10/rsvg-install.propsin
rename to build/win32/vs12/rsvg-install.propsin
index 4ffeedc..d89c1a9 100644
--- a/build/win32/vs10/rsvg-install.propsin
+++ b/build/win32/vs12/rsvg-install.propsin
@@ -16,7 +16,7 @@ copy $(SolutionDir)$(Configuration)\$(Platform)\bin\rsvg-view-3.exe $(CopyDir)\b
 copy $(SolutionDir)$(Configuration)\$(Platform)\bin\rsvg-view-3.pdb $(CopyDir)\bin
 
 mkdir $(CopyDir)\include\librsvg-$(ApiVersion)\librsvg
-#include "rsvg.vs10.headers"
+#include "rsvg.vs12.headers"
 
 mkdir $(CopyDir)\lib\gdk-pixbuf-2.0\2.10.0\loaders
 copy $(SolutionDir)$(Configuration)\$(Platform)\bin\rsvg-$(ApiVersion).lib $(CopyDir)\lib
diff --git a/build/win32/vs10/rsvg-install.vcxproj b/build/win32/vs12/rsvg-install.vcxproj
similarity index 97%
rename from build/win32/vs10/rsvg-install.vcxproj
rename to build/win32/vs12/rsvg-install.vcxproj
index b077233..017c556 100644
--- a/build/win32/vs10/rsvg-install.vcxproj
+++ b/build/win32/vs12/rsvg-install.vcxproj
@@ -25,24 +25,24 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
diff --git a/build/win32/vs10/rsvg-version-paths.props b/build/win32/vs12/rsvg-version-paths.props
similarity index 99%
rename from build/win32/vs10/rsvg-version-paths.props
rename to build/win32/vs12/rsvg-version-paths.props
index 7c6a72d..a26f07d 100644
--- a/build/win32/vs10/rsvg-version-paths.props
+++ b/build/win32/vs12/rsvg-version-paths.props
@@ -4,7 +4,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <ApiVersion>2.0</ApiVersion>
-    <VSVer>10</VSVer>
+    <VSVer>12</VSVer>
     <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
     <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
     <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)</DefDir>
diff --git a/build/win32/vs10/rsvg-view-3.vcxproj b/build/win32/vs12/rsvg-view-3.vcxproj
similarity index 98%
rename from build/win32/vs10/rsvg-view-3.vcxproj
rename to build/win32/vs12/rsvg-view-3.vcxproj
index 11092bd..08285d5 100644
--- a/build/win32/vs10/rsvg-view-3.vcxproj
+++ b/build/win32/vs12/rsvg-view-3.vcxproj
@@ -26,24 +26,24 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
diff --git a/build/win32/vs10/rsvg-view-3.vcxproj.filters b/build/win32/vs12/rsvg-view-3.vcxproj.filters
similarity index 100%
rename from build/win32/vs10/rsvg-view-3.vcxproj.filters
rename to build/win32/vs12/rsvg-view-3.vcxproj.filters
diff --git a/build/win32/vs10/rsvg.vcxproj.filtersin b/build/win32/vs12/rsvg.vcxproj.filtersin
similarity index 96%
rename from build/win32/vs10/rsvg.vcxproj.filtersin
rename to build/win32/vs12/rsvg.vcxproj.filtersin
index 804d5b0..5615420 100644
--- a/build/win32/vs10/rsvg.vcxproj.filtersin
+++ b/build/win32/vs12/rsvg.vcxproj.filtersin
@@ -15,7 +15,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-#include "rsvg.vs10.sourcefiles.filters"
+#include "rsvg.vs12.sourcefiles.filters"
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
diff --git a/build/win32/vs10/rsvg.vcxprojin b/build/win32/vs12/rsvg.vcxprojin
similarity index 98%
rename from build/win32/vs10/rsvg.vcxprojin
rename to build/win32/vs12/rsvg.vcxprojin
index 8bdc079..34a915e 100644
--- a/build/win32/vs10/rsvg.vcxprojin
+++ b/build/win32/vs12/rsvg.vcxprojin
@@ -26,24 +26,24 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -181,7 +181,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-#include "rsvg.vs10.sourcefiles"
+#include "rsvg.vs12.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\..\config.h.win32">
diff --git a/build/win32/vs14/Makefile.am b/build/win32/vs14/Makefile.am
index a3fdc20..e2dde5d 100644
--- a/build/win32/vs14/Makefile.am
+++ b/build/win32/vs14/Makefile.am
@@ -17,6 +17,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 8c67d9f..94050a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -289,9 +289,6 @@ doc/version.xml
 config.h.win32
 build/Makefile
 build/win32/Makefile
-build/win32/vs9/Makefile
-build/win32/vs10/Makefile
-build/win32/vs11/Makefile
 build/win32/vs12/Makefile
 build/win32/vs14/Makefile
 ])
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]