MSVC Builds: "Add" Visual Studio 2015 Projects

This "adds" Visual Studio 2015 projects by doing what we did before:
Copy the Visual Studio 2010 projects and updating items in there as
needed, as the 2010 projects are largely the same to the 2015 ones.

6 files changed, 57 insertions, 15 deletions

diff --git a/build/Makefile-newvs.am b/build/Makefile-newvs.am
index e3acd91..97b2459 100644
--- a/build/Makefile-newvs.am
+++ b/build/Makefile-newvs.am
@@ -1,19 +1,27 @@
 # Centralized autotools file
-# Create the Visual Studio 2012/2013 project files
+# Create the Visual Studio 2012/2013/2015 project files
 # from the Visual Studio 2010 project files
 
+# This autotools file, from GLib, can be used in other projects
+# that have Visual Studio build support, and is copied into
+# $(srcroot)/build/.
+
 # Author: Fan, Chun-wei
 # November 05, 2012
 
-# MSVC_SLN: name of root project
-
-MSVC_FORMAT_VER=$(shell echo $$(expr $(MSVC_VER) + 1))
+# 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
 
-$(MSVC_SLN).sln: $(top_srcdir)/build/win32/vs10/$(MSVC_SLN).sln
-	cat $< | sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' | sed 's/2010/$(MSVC_VER_LONG)/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@
+%.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)/$@
+	rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
 
-README.txt: $(top_srcdir)/build/win32/vs10/README.txt
-	cat $< | sed 's/vs10/vs$(MSVC_VER)/g' | sed 's/VS10/VS$(MSVC_VER)/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@
+%.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)/$@
+	rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
 
 %.vcxproj:
 	if test -e $(top_srcdir)/build/win32/vs10/$@; then \
diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am
index 04dd123..576b177 100644
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -17,5 +17,5 @@
 #See COPYRIGHTS file for copyright information.
 
 SUBDIRS = \
-	vs9 vs10 vs11 vs12
+	vs9 vs10 vs11 vs12 vs14
 
diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am
index 53c654a..1585d00 100644
--- a/build/win32/vs11/Makefile.am
+++ b/build/win32/vs11/Makefile.am
@@ -30,10 +30,8 @@ EXTRA_DIST = \
 
 DISTCLEANFILES = $(EXTRA_DIST)
 
-MSVC_SLN = libcroco
-
 MSVC_VER = 11
-
+MSVC_FORMAT_VER = 12
 MSVC_VER_LONG = 2012
 
 include $(top_srcdir)/build/Makefile-newvs.am
diff --git a/build/win32/vs12/Makefile.am b/build/win32/vs12/Makefile.am
index 26cda86..fec229e 100644
--- a/build/win32/vs12/Makefile.am
+++ b/build/win32/vs12/Makefile.am
@@ -30,10 +30,8 @@ EXTRA_DIST = \
 
 DISTCLEANFILES = $(EXTRA_DIST)
 
-MSVC_SLN = libcroco
-
 MSVC_VER = 12
-
+MSVC_FORMAT_VER = 12
 MSVC_VER_LONG = 2013
 
 include $(top_srcdir)/build/Makefile-newvs.am
diff --git a/build/win32/vs14/Makefile.am b/build/win32/vs14/Makefile.am
new file mode 100644
index 0000000..bc1d319
--- /dev/null
+++ b/build/win32/vs14/Makefile.am
@@ -0,0 +1,37 @@
+# This file is part of The Croco Library
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of version 2.1 of the GNU Lesser General Public
+# License as published by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+# Author: Fan, Chun-wei
+# See COPYRIGHTS file for copyright information.
+
+EXTRA_DIST = \
+	libcroco.sln		\
+	croco.vcxproj		\
+	croco.vcxproj.filters		\
+	csslint.vcxproj		\
+	csslint.vcxproj.filters	\
+	croco-install.vcxproj	\
+	croco-build-defines.props	\
+	croco-gen-srcs.props	\
+	croco-install.props	\
+	croco-version-paths.props
+
+DISTCLEANFILES = $(EXTRA_DIST)
+
+MSVC_VER = 14
+MSVC_FORMAT_VER = 12
+MSVC_VER_LONG = 14
+
+include $(top_srcdir)/build/Makefile-newvs.am
diff --git a/configure.ac b/configure.ac
index 6865eff..c42cf46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,6 +152,7 @@ build/win32/vs10/Makefile
 build/win32/vs10/croco-version-paths.props
 build/win32/vs11/Makefile
 build/win32/vs12/Makefile
+build/win32/vs14/Makefile
 docs/Makefile
 docs/examples/Makefile
 docs/reference/Makefile