[gdk-pixbuf] MSVC Builds: "Add" Visual Studio 2015 Projects



commit 5abdbcc42d45384c745695d374c460dd21cda450
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Sep 9 22:58:53 2015 +0800

    MSVC Builds: "Add" Visual Studio 2015 Projects
    
    This "adds" projects for Visual Studio 2015 builds by doing what we
    did before: copy the Visual Studio 2010 projects and replace items in
    there as necessary, as the formats of the project files for Visual
    Studio 2010, 2012, 2013 and 2015 are largely the same.

 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 f2f3f03..c6f1aa4 100644
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -2,7 +2,8 @@ SUBDIRS =       \
        vs9     \
        vs10    \
        vs11    \
-       vs12
+       vs12    \
+       vs14
 
 EXTRA_DIST = math-compat/math.h
 
diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am
index 59ca727..fa74c9c 100644
--- a/build/win32/vs11/Makefile.am
+++ b/build/win32/vs11/Makefile.am
@@ -17,11 +17,9 @@ EXTRA_DIST = \
 
 DISTCLEANFILES = $(EXTRA_DIST)
 
-MSVC_SLN = gdk-pixbuf
-
 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 a10fa2e..8bf3f47 100644
--- a/build/win32/vs12/Makefile.am
+++ b/build/win32/vs12/Makefile.am
@@ -17,11 +17,9 @@ EXTRA_DIST = \
 
 DISTCLEANFILES = $(EXTRA_DIST)
 
-MSVC_SLN = gdk-pixbuf
-
 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..2a08c26
--- /dev/null
+++ b/build/win32/vs14/Makefile.am
@@ -0,0 +1,26 @@
+EXTRA_DIST = \
+       README.txt      \
+       gdk-pixbuf.sln  \
+       gdk-pixbuf-version-paths.props  \
+       gdk-pixbuf-build-defines.props  \
+       gdk-pixbuf-gen-srcs.props       \
+       gdk-pixbuf-install.props         \
+       gdk-pixbuf.vcxproj      \
+       gdk-pixbuf.vcxproj.filters      \
+       gdk-pixbuf-csource.vcxproj      \
+       gdk-pixbuf-csource.vcxproj.filters      \
+       gdk-pixbuf-query-loaders.vcxproj         \
+       gdk-pixbuf-query-loaders.vcxproj.filters         \
+       gdk-pixbuf-pixdata.vcxproj      \
+       gdk-pixbuf-pixdata.vcxproj.filters      \
+       gdk-pixbuf-install.vcxproj
+
+DISTCLEANFILES = $(EXTRA_DIST)
+
+MSVC_VER = 14
+MSVC_VER_LONG = 14
+MSVC_FORMAT_VER = 12
+
+include $(top_srcdir)/build/Makefile-newvs.am
+
+-include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index d21e44a..1c89779 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1094,6 +1094,7 @@ build/win32/vs9/Makefile
 build/win32/vs10/Makefile
 build/win32/vs11/Makefile
 build/win32/vs12/Makefile
+build/win32/vs14/Makefile
 docs/Makefile
 docs/reference/Makefile
 docs/reference/gdk-pixbuf/Makefile


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