[pango] MSVC Builds: "Add" MSVC 2015 Project Files



commit 9681fa2ca8dfeb570471a3828e5b6aee4253025c
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Sep 9 12:02:34 2015 +0800

    MSVC Builds: "Add" MSVC 2015 Project Files
    
    This "adds" Visual Studio 2015 projects in the way that we did before:
    copy the Visual Studio 2010 projects and replacing the items in there
    as necessary.
    
    Oh, this does pass 'make -jN distcheck' :)

 build/Makefile-newvs.am      |   22 +++++++++++++---------
 build/win32/Makefile.am      |    3 ++-
 build/win32/vs11/Makefile.am |    4 +---
 build/win32/vs12/Makefile.am |    4 +---
 build/win32/vs14/Makefile.am |   26 ++++++++++++++++++++++++++
 configure.ac                 |    1 +
 6 files changed, 44 insertions(+), 16 deletions(-)
---
diff --git a/build/Makefile-newvs.am b/build/Makefile-newvs.am
index e3acd91..33ee29f 100644
--- a/build/Makefile-newvs.am
+++ b/build/Makefile-newvs.am
@@ -5,15 +5,19 @@
 # Author: Fan, Chun-wei
 # November 05, 2012
 
-# MSVC_SLN: name of root project
-
-MSVC_FORMAT_VER=$(shell echo $$(expr $(MSVC_VER) + 1))
-
-$(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)/$@
-
-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)/$@
+# MSVC_VER_LONG: Long Version of Visual Studio (2012, 2013, 2015 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)/$@
+       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)/$@
+       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 87d1000..0a33798 100644
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -2,7 +2,8 @@ SUBDIRS =       \
        vs9     \
        vs10    \
        vs11    \
-       vs12
+       vs12    \
+       vs14
 
 EXTRA_DIST =   \
        unistd.h
diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am
index b4d4985..3984baf 100644
--- a/build/win32/vs11/Makefile.am
+++ b/build/win32/vs11/Makefile.am
@@ -19,10 +19,8 @@ EXTRA_DIST = \
 
 DISTCLEANFILES = $(EXTRA_DIST)
 
-MSVC_SLN = pango
-
 MSVC_VER = 11
-
 MSVC_VER_LONG = 2012
+MSVC_FORMAT_VER = 12
 
 include $(top_srcdir)/build/Makefile-newvs.am
diff --git a/build/win32/vs12/Makefile.am b/build/win32/vs12/Makefile.am
index 74384d1..146d90c 100644
--- a/build/win32/vs12/Makefile.am
+++ b/build/win32/vs12/Makefile.am
@@ -19,10 +19,8 @@ EXTRA_DIST = \
 
 DISTCLEANFILES = $(EXTRA_DIST)
 
-MSVC_SLN = pango
-
 MSVC_VER = 12
-
 MSVC_VER_LONG = 2013
+MSVC_FORMAT_VER = 12
 
 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..0d210ec
--- /dev/null
+++ b/build/win32/vs14/Makefile.am
@@ -0,0 +1,26 @@
+EXTRA_DIST =   \
+       pango.sln                               \
+       pango-build-defines.props               \
+       pango-ignore-fc.props                   \
+       pango-install-bin.props                 \
+       pango-install.props                     \
+       pango-prebuild.props                    \
+       pango-version-paths.props               \
+       pango.vcxproj                           \
+       pango.vcxproj.filters                   \
+       pangoft2.vcxproj                        \
+       pangoft2.vcxproj.filters                \
+       pangowin32.vcxproj                      \
+       pangowin32.vcxproj.filters              \
+       pangocairo.vcxproj                      \
+       pangocairo.vcxproj.filters              \
+       pango-install.vcxproj                   \
+       README.txt
+
+DISTCLEANFILES = $(EXTRA_DIST)
+
+MSVC_VER = 14
+MSVC_VER_LONG = 14
+MSVC_FORMAT_VER = 12
+
+include $(top_srcdir)/build/Makefile-newvs.am
diff --git a/configure.ac b/configure.ac
index c58c2d1..da87fad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -616,6 +616,7 @@ build/win32/vs9/Makefile
 build/win32/vs10/Makefile
 build/win32/vs11/Makefile
 build/win32/vs12/Makefile
+build/win32/vs14/Makefile
 pango.pc
 pangowin32.pc
 pangoft2.pc


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