[gtk/gtk-3-24] Visual Studio: "Add" Visual Studio 2019 project files



commit a8f10f6865ed691c59298c79a37adca478e6cf97
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Jun 18 14:55:07 2019 +0800

    Visual Studio: "Add" Visual Studio 2019 project files
    
    Use the scripts that we have to copy the 2010 projects and updating
    the various items in the project files to make them Visual Studio
    2019-compatible upon 'make dist'.
    
    Also ensure that the introspection NMake Makefiles can properly detect
    that we are building with Visual Studio 2019.

 build/win32/Makefile.am        |  3 ++-
 build/win32/detectenv-msvc.mak |  4 +++-
 build/win32/vs16/Makefile.am   | 53 ++++++++++++++++++++++++++++++++++++++++++
 configure.ac                   |  1 +
 4 files changed, 59 insertions(+), 2 deletions(-)
---
diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am
index fe2cbb2204..032f0f1cfd 100644
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -32,7 +32,8 @@ SUBDIRS =     \
        vs11    \
        vs12    \
        vs14    \
-       vs15
+       vs15    \
+       vs16
 
 EXTRA_DIST +=  \
        detectenv-msvc.mak              \
diff --git a/build/win32/detectenv-msvc.mak b/build/win32/detectenv-msvc.mak
index 6fd96ccc65..acecbf5885 100644
--- a/build/win32/detectenv-msvc.mak
+++ b/build/win32/detectenv-msvc.mak
@@ -42,8 +42,10 @@ VSVER = 11
 VSVER = 12
 !elseif $(VCVERSION) > 1899 && $(VCVERSION) < 1910
 VSVER = 14
-!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 2000
+!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 1920
 VSVER = 15
+!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 2000
+VSVER = 16
 !else
 VSVER = 0
 !endif
diff --git a/build/win32/vs16/Makefile.am b/build/win32/vs16/Makefile.am
new file mode 100644
index 0000000000..c723b54100
--- /dev/null
+++ b/build/win32/vs16/Makefile.am
@@ -0,0 +1,53 @@
+include $(top_srcdir)/Makefile.decl
+
+EXTRA_DIST +=  \
+       README.txt      \
+       gtk+.sln        \
+       gtk3-prebuild.vcxproj   \
+       gtk3-prebuild.vcxproj.filters   \
+       gdk3-win32.vcxproj      \
+       gdk3-win32.vcxproj.filters      \
+       gdk-3.vcxproj   \
+       gdk-3.vcxproj.filters   \
+       gtk-3.vcxproj   \
+       gtk-3.vcxproj.filters   \
+       gtk-builder-tool.vcxproj                \
+       gtk-builder-tool.vcxproj.filters        \
+       gtk-encode-symbolic-svg.vcxproj \
+       gtk-encode-symbolic-svg.vcxproj.filters \
+       gtk-query-settings.vcxproj              \
+       gtk-query-settings.vcxproj.filters      \
+       gtk-update-icon-cache.vcxproj           \
+       gtk-update-icon-cache.vcxproj.filters   \
+       gtk3-demo.vcxproj       \
+       gtk3-demo.vcxproj.filters       \
+       gtk3-demo-application.vcxproj   \
+       gtk3-demo-application.vcxproj.filters   \
+       gtk3-icon-browser.vcxproj       \
+       gtk3-icon-browser.vcxproj.filters       \
+       gailutil-3.vcxproj      \
+       gailutil-3.vcxproj.filters      \
+       gtk3-install.vcxproj    \
+       gtk3-install.vcxproj.filters    \
+       gtk3-introspect.vcxproj         \
+       broadwayd.vcxproj       \
+       broadwayd.vcxproj.filters       \
+       gdk3-broadway.vcxproj   \
+       gdk3-broadway.vcxproj.filters   \
+       gtk3-build-defines.props        \
+       gtk3-copy-gdk-broadway.props    \
+       gtk3-gen-srcs.props     \
+       gtk3-ignore-broadway.props      \
+       gtk3-install.props      \
+       gtk3-version-paths.props
+
+DISTCLEANFILES = $(EXTRA_DIST)
+
+MSVC_VER = 16
+MSVC_VER_LONG = 16
+MSVC_TOOLSET = 142
+MSVC_FORMAT_VER = 12
+
+include $(top_srcdir)/build/Makefile-newvs.am
+
+-include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index 2bda3f44d1..1ee3703801 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1970,6 +1970,7 @@ build/win32/vs11/Makefile
 build/win32/vs12/Makefile
 build/win32/vs14/Makefile
 build/win32/vs15/Makefile
+build/win32/vs16/Makefile
 gdk/Makefile
 gdk/broadway/Makefile
 gdk/x11/Makefile


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