[gtksourceview] Visual Studio builds: Add support for Visual Studio 2017



commit 6d1dd3b4728a6179267dcebed94b411d235555b0
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Mar 8 18:03:27 2017 +0800

    Visual Studio builds: Add support for Visual Studio 2017
    
    This adds support for Visual Studio 2017 projects by using the new
    win32/Makefile-newvs.am that was updated from the last commit, so that
    the 2010 projects can be copied and updated accordingly for the 2017
    projects.
    
    Note that the format of the toolset version string changed for Visual
    Studio 2017, so allow and use a custom toolset version string when
    specified, otherwise generate it as it was before.
    
    Note also that Visual Studio 2017 aims to be compatible with Visual Studio
    2015 on the CRT level, so one should be able to use 2017-compiled binaries
    with 2015-compiled binaries without problems.

 configure.ac           |    6 ++++++
 win32/Makefile.am      |    3 ++-
 win32/vs10/Makefile.am |    1 +
 win32/vs15/Makefile.am |   21 +++++++++++++++++++++
 4 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3dd1db0..dccd3be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -224,6 +224,11 @@ VAPIGEN_CHECK
 ABS_TOP_SRCDIR=`cd $srcdir && pwd`
 AC_SUBST(ABS_TOP_SRCDIR)
 
+# Check whether MSVC toolset is explicitly set
+
+AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x])
+AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x])
+
 # Output files
 AC_CONFIG_FILES([
 gtksourceview-${GSV_API_VERSION}.pc:gtksourceview.pc.in
@@ -237,6 +242,7 @@ win32/vs10/gtksourceview${GSV_API_VERSION}-gen-srcs.props
 win32/vs11/Makefile
 win32/vs12/Makefile
 win32/vs14/Makefile
+win32/vs15/Makefile
 data/Makefile
 data/glade/Makefile
 data/glade/gtksourceview.xml
diff --git a/win32/Makefile.am b/win32/Makefile.am
index 04d21eb..93cf7a9 100644
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -3,7 +3,8 @@ SUBDIRS = \
        vs10    \
        vs11    \
        vs12    \
-       vs14
+       vs14    \
+       vs15
 
 GENERATED_ITEMS = gen-enums.bat
 
diff --git a/win32/vs10/Makefile.am b/win32/vs10/Makefile.am
index b00cf6f..11b9483 100644
--- a/win32/vs10/Makefile.am
+++ b/win32/vs10/Makefile.am
@@ -22,6 +22,7 @@ gtksourceview@GSV_API_VERSION@-install.props: $(top_srcdir)/win32/vs10/gtksource
        -$(RM) $(top_builddir)/win32/vs11/gtksourceview@GSV_API_VERSION@-install.props
        -$(RM) $(top_builddir)/win32/vs12/gtksourceview@GSV_API_VERSION@-install.props
        -$(RM) $(top_builddir)/win32/vs14/gtksourceview@GSV_API_VERSION@-install.props
+       -$(RM) $(top_builddir)/win32/vs15/gtksourceview@GSV_API_VERSION@-install.props
        $(CPP) -P - <$(top_srcdir)/win32/vs10/gtksourceview@GSV_API_VERSION@-install.propsin >$@
        $(RM) $(MSVC10_HEADERS_LISTS)
 
diff --git a/win32/vs15/Makefile.am b/win32/vs15/Makefile.am
new file mode 100644
index 0000000..af23f6b
--- /dev/null
+++ b/win32/vs15/Makefile.am
@@ -0,0 +1,21 @@
+EXTRA_DIST =                                                   \
+       gtksourceview-@GSV_API_VERSION@.sln                     \
+       gtksourceview@GSV_API_VERSION@-build-defines.props      \
+       gtksourceview@GSV_API_VERSION@-gen-srcs.props           \
+       gtksourceview@GSV_API_VERSION@-install.props            \
+       gtksourceview@GSV_API_VERSION@-version-paths.props      \
+       gtksourceview-@GSV_API_VERSION@.vcxproj                 \
+       gtksourceview-@GSV_API_VERSION@.vcxproj.filters         \
+       gtksourceview@GSV_API_VERSION@-install.vcxproj
+
+DISTCLEANFILES = $(EXTRA_DIST)
+
+MSVC_BASE_VER = 10
+MSVC_BASE_VER_LONG = 2010
+MSVC_VER = 15
+MSVC_VER_LONG = 15
+MSVC_TOOLSET = 141
+
+include $(top_srcdir)/win32/Makefile-newvs.am
+
+-include $(top_srcdir)/git.mk


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