Imported Upstream version 1.2.4

[platform/upstream/json-glib.git] / build / win32 / vs12 / Makefile.in

diff --git a/build/win32/vs12/Makefile.in b/build/win32/vs12/Makefile.in
index 68ddc9c..69c831c 100644 (file)
--- a/build/win32/vs12/Makefile.in
+++ b/build/win32/vs12/Makefile.in
@@ -25,9 +25,9 @@
 # Author: Fan, Chun-wei
 # November 05, 2012
 
-# 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
+# MSVC_VER_LONG: Long Version of target Visual Studio (2012, 2013, 14, 15  and so on)
+# MSVC_VER: Short Version of target Visual Studio (11 for 2012, 12 for 2013, 14 for 2015, 15 for 2017)
+# MSVC_TOOLSET: Use if target MSVC toolset is not in the form v$(MSVC_VER)0, meaning v$(MSVC_TOOLSET)
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
@@ -360,6 +360,7 @@ EXTRA_DIST = \
        gvariant.vcxproj                \
        gvariant.vcxproj.filters        \
        json-glib-install.vcxproj       \
+       json-glib-install.vcxproj.filters       \
        node.vcxproj            \
        node.vcxproj.filters    \
        object.vcxproj          \
@@ -385,6 +386,8 @@ MSVC_VER = 12
 MSVC_FORMAT_VER = 12
 MSVC_VER_LONG = 2013
 DISTCLEANFILES = $(EXTRA_DIST)
+@MSVC_BASE_NO_TOOLSET_SET_TRUE@MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0
+@MSVC_NO_TOOLSET_SET_TRUE@MSVC_TOOLSET = $(MSVC_VER)0
 all: all-am
 
 .SUFFIXES:
@@ -591,12 +594,12 @@ uninstall-am:
 
 %.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)/$@; \
+               sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(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/v100/v$(MSVC_TOOLSET)/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
        fi
 
-%.props:
+%.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)/$@; \
        else \