Build: Add Build Support for Visual Studio 2013

Like the Visual Studio 2012 projects, the Visual Studio 2013 project files
are only slightly different from the Visual Studio 2010 files, in more or
less the same manner.  We can thus easily provide out-of-box support for
building under Visual Studio 2013 by expanding on the scripts used to
provide support for the Visual Studio 2012 projects, without adding much
maintainance overhead.

diff --git a/build/Makefile-newvs.am b/build/Makefile-newvs.am
index 58c1e15..04d2405 100644 (file)
--- a/build/Makefile-newvs.am
+++ b/build/Makefile-newvs.am
@@ -1,5 +1,5 @@
 # Centralized autotools file
-# Create the Visual Studio 2012 project files
+# Create the Visual Studio 2012/2013 project files
 # from the Visual Studio 2010 project files
 
 # Author: Fan, Chun-wei
@@ -7,18 +7,18 @@
 
 # MSVC_SLN: name of root project
 
-VCXPROJ_FILES =
+MSVC_FORMAT_VER=$(shell echo $$(expr $(MSVC_VER) + 1))
 
 $(MSVC_SLN).sln: $(top_srcdir)/build/win32/vs10/$(MSVC_SLN).sln create_vcxproj copy_filters create_props
-       cat $(top_srcdir)/build/win32/vs10/$(MSVC_SLN).sln | sed 's/11\.00/12\.00/g' | sed 's/2010/2012/g' > $(top_builddir)/build/win32/vs11/$(MSVC_SLN).sln
+       cat $(top_srcdir)/build/win32/vs10/$(MSVC_SLN).sln | sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' | sed 's/2010/$(MSVC_VER_LONG)/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$(MSVC_SLN).sln
 
 README.txt: $(top_srcdir)/build/win32/vs10/README.txt
-       cat $(top_srcdir)/build/win32/vs10/README.txt | sed 's/vs10/vs11/g' | sed 's/VS10/VS11/g' > $(top_builddir)/build/win32/vs11/README.txt
+       cat $(top_srcdir)/build/win32/vs10/README.txt | sed 's/vs10/vs$(MSVC_VER)/g' | sed 's/VS10/VS$(MSVC_VER)/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/README.txt
 
 create_vcxproj:
        for F in `(cd $(top_builddir)/build/win32/vs10 && ls *.vcxproj)`; do \
                case $$F in \
-                       *)      cat $(top_builddir)/build/win32/vs10/$$F | sed 's/v100/v110/g' > $(top_builddir)/build/win32/vs11/$$F \
+                       *)      cat $(top_builddir)/build/win32/vs10/$$F | sed 's/v100/v$(MSVC_VER)0/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$$F \
                        ;; \
                esac; \
        done
@@ -26,12 +26,12 @@ create_vcxproj:
 create_props:
        for F in `(cd $(top_builddir)/build/win32/vs10 && ls *.props)`; do \
                case $$F in \
-                       *)      cat $(top_builddir)/build/win32/vs10/$$F | sed 's/10/11/g' > $(top_builddir)/build/win32/vs11/$$F \
+                       *)      cat $(top_builddir)/build/win32/vs10/$$F | sed 's/10/$(MSVC_VER)/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$$F \
                        ;; \
                esac; \
        done
 
 copy_filters:
-       cp  $(top_srcdir)/build/win32/vs10/*.vcxproj.filters $(top_builddir)/build/win32/vs11/
+       cp  $(top_srcdir)/build/win32/vs10/*.vcxproj.filters $(top_builddir)/build/win32/vs$(MSVC_VER)/
 
 

diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am
index 44032db..6ee0d6e 100644 (file)
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -1,4 +1,5 @@
 SUBDIRS =      \
        vs9     \
        vs10    \
-       vs11
+       vs11    \
+       vs12

diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am
index b97b077..9079941 100644 (file)
--- a/build/win32/vs11/Makefile.am
+++ b/build/win32/vs11/Makefile.am
@@ -13,4 +13,8 @@ DISTCLEANFILES = $(EXTRA_DIST)
 
 MSVC_SLN = atk
 
+MSVC_VER = 11
+
+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
new file mode 100644 (file)
index 0000000..ae1eab3
--- /dev/null
+++ b/build/win32/vs12/Makefile.am
@@ -0,0 +1,20 @@
+EXTRA_DIST = \
+       README.txt \
+       atk.sln \
+       atk.vcxproj \
+       atk.vcxproj.filters \
+       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 = 12
+
+MSVC_VER_LONG = 2013
+
+include $(top_srcdir)/build/Makefile-newvs.am

diff --git a/configure.ac b/configure.ac
index 0452a04..a5447c2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -275,6 +275,7 @@ build/win32/Makefile
 build/win32/vs9/Makefile
 build/win32/vs10/Makefile
 build/win32/vs11/Makefile
+build/win32/vs12/Makefile
 docs/Makefile
 docs/version.xml
 atk.spec