diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2016-10-26 12:57:42 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2016-11-01 15:39:16 +0800 |
| commit | acd07cfc551c19872358c3f6224e4cd5e57c0bbc (patch) | |
| tree | d11cca8789901d9de60d1656109ddb15dbf96a0d /build | |
| parent | 1f33b36cd14b4993dc06d8c0726a3dcf55fd140a (diff) | |
| download | glib-acd07cfc551c19872358c3f6224e4cd5e57c0bbc.tar.gz | |
build/Makefile-newvs.am: Do not hardcode the baseline MSVC version
This is to allow specification of the baseline Visual Studio 201x version as
the baseline version may not be 2010 anymore as we begin to require C99
features that will require Visual Studio 2013 or later.
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile-newvs.am | 30 | ||||
| -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 | 2 |
4 files changed, 22 insertions, 14 deletions
diff --git a/build/Makefile-newvs.am b/build/Makefile-newvs.am index b5e321607..9fd89f95d 100644 --- a/build/Makefile-newvs.am +++ b/build/Makefile-newvs.am @@ -9,37 +9,39 @@ # Author: Fan, Chun-wei # November 05, 2012 +# MSVC_BASE_VER: Baseline MSVC 201x version to copy/process project files from (10 for 2010, 11 for 2012, 12 for 2013, 14 for 2015 and so on) +# MSVC_BASE_VER_LONG: Long Version of baseline Visual Studio 201x version (2010, 2012, 2013, 14 and so on) # 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 %.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)/$@ + sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp + sed 's/$(MSVC_BASE_VER_LONG)/$(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)/$@ + sed 's/vs$(MSVC_BASE_VER)/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp + sed 's/VS$(MSVC_BASE_VER)/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 \ - sed 's/v100/v$(MSVC_VER)0/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + if test -e $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@; then \ + sed 's/v$(MSVC_BASE_VER)0/v$(MSVC_VER)0/g' < $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ else \ - sed 's/v100/v$(MSVC_VER)0/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + sed 's/v$(MSVC_BASE_VER)0/v$(MSVC_VER)0/g' < $(top_builddir)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ fi -%.props: $(top_builddir)/build/win32/vs10/Makefile - if test -e $(top_srcdir)/build/win32/vs10/$@; then \ - sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ +%.props: $(top_builddir)/build/win32/vs$(MSVC_BASE_VER)/Makefile + if test -e $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@; then \ + sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ else \ - sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ fi %.vcxproj.filters: - if test -e $(top_srcdir)/build/win32/vs10/$@; then \ - cp $(top_srcdir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + if test -e $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@; then \ + cp $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ else \ - cp $(top_builddir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + cp $(top_builddir)/build/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ fi diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am index d98d1db2c..61de04ee0 100644 --- a/build/win32/vs11/Makefile.am +++ b/build/win32/vs11/Makefile.am @@ -40,6 +40,8 @@ EXTRA_DIST = \ DISTCLEANFILES = $(EXTRA_DIST) +MSVC_BASE_VER = 10 +MSVC_BASE_VER_LONG = 2010 MSVC_VER = 11 MSVC_FORMAT_VER = 12 MSVC_VER_LONG = 2012 diff --git a/build/win32/vs12/Makefile.am b/build/win32/vs12/Makefile.am index b863236ab..94f8c71ab 100644 --- a/build/win32/vs12/Makefile.am +++ b/build/win32/vs12/Makefile.am @@ -40,6 +40,8 @@ EXTRA_DIST = \ DISTCLEANFILES = $(EXTRA_DIST) +MSVC_BASE_VER = 10 +MSVC_BASE_VER_LONG = 2010 MSVC_VER = 12 MSVC_FORMAT_VER = 12 MSVC_VER_LONG = 2013 diff --git a/build/win32/vs14/Makefile.am b/build/win32/vs14/Makefile.am index a17e93112..09051c57e 100644 --- a/build/win32/vs14/Makefile.am +++ b/build/win32/vs14/Makefile.am @@ -40,6 +40,8 @@ EXTRA_DIST = \ DISTCLEANFILES = $(EXTRA_DIST) +MSVC_BASE_VER = 10 +MSVC_BASE_VER_LONG = 2010 MSVC_VER = 14 MSVC_FORMAT_VER = 12 MSVC_VER_LONG = 14 |