diff options
author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-09-09 12:04:59 +0800 |
---|---|---|
committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-09-09 15:29:48 +0800 |
commit | fd9fefd7f0fc0e9eb67e60d853e4e8d05c530999 (patch) | |
tree | 710255e16b22092bf75c445a923e7a4803fa889e | |
parent | a396cc5a8c3f60ded7994df8a404beea2e875bcd (diff) | |
download | atk-fd9fefd7f0fc0e9eb67e60d853e4e8d05c530999.tar.gz |
MSVC Builds: "Add" Visual Studio 2015 Projects
This "adds" Visaul Studio 2015 projects by doing what we did before:
copying the Visual Studio 2010 projects and replacing items in there
as necessary.
-rw-r--r-- | build/Makefile-newvs.am | 22 | ||||
-rw-r--r-- | build/win32/Makefile.am | 3 | ||||
-rw-r--r-- | build/win32/vs11/Makefile.am | 2 | ||||
-rw-r--r-- | build/win32/vs12/Makefile.am | 2 | ||||
-rw-r--r-- | build/win32/vs14/Makefile.am | 20 | ||||
-rw-r--r-- | configure.ac | 1 |
6 files changed, 38 insertions, 12 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 6ee0d6e..897dc8b 100644 --- a/build/win32/Makefile.am +++ b/build/win32/Makefile.am @@ -2,4 +2,5 @@ SUBDIRS = \ vs9 \ vs10 \ vs11 \ - vs12 + vs12 \ + vs14 diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am index f22c4af..f31c518 100644 --- a/build/win32/vs11/Makefile.am +++ b/build/win32/vs11/Makefile.am @@ -14,7 +14,7 @@ DISTCLEANFILES = $(EXTRA_DIST) MSVC_SLN = atk 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 8032b58..c9330db 100644 --- a/build/win32/vs12/Makefile.am +++ b/build/win32/vs12/Makefile.am @@ -14,7 +14,7 @@ DISTCLEANFILES = $(EXTRA_DIST) MSVC_SLN = atk 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..140e7c5 --- /dev/null +++ b/build/win32/vs14/Makefile.am @@ -0,0 +1,20 @@ +EXTRA_DIST = \ + README.txt \ + atk.sln \ + atk.vcxproj \ + atk.vcxproj.filters \ + atk-install.vcxproj \ + atk-build-defines.props \ + atk-install.props \ + atk-version-paths.props \ + atk-gen-src.props + +DISTCLEANFILES = $(EXTRA_DIST) + +MSVC_SLN = atk + +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 685e72b..f5c27bf 100644 --- a/configure.ac +++ b/configure.ac @@ -274,6 +274,7 @@ build/win32/vs9/Makefile build/win32/vs10/Makefile build/win32/vs11/Makefile build/win32/vs12/Makefile +build/win32/vs14/Makefile docs/Makefile docs/version.xml atk.spec |