build: Rename MSVC_Net2017 to MSVC_NMake

This prepares for the transition to using NMake Makefiles for building
glibmm, rather than the Visual Studio project files, to ease future
maintenance.

48 files changed, 9 insertions, 9 deletions

diff --git a/MSVC_Net2017/compose.vcxproj b/MSVC_NMake/compose.vcxproj
index 38cb4049..38cb4049 100644
--- a/MSVC_Net2017/compose.vcxproj
+++ b/MSVC_NMake/compose.vcxproj
diff --git a/MSVC_Net2017/compose.vcxproj.filters b/MSVC_NMake/compose.vcxproj.filters
index 252ebc2f..252ebc2f 100644
--- a/MSVC_Net2017/compose.vcxproj.filters
+++ b/MSVC_NMake/compose.vcxproj.filters
diff --git a/MSVC_Net2017/dispatcher.vcxproj b/MSVC_NMake/dispatcher.vcxproj
index 2e79b927..2e79b927 100644
--- a/MSVC_Net2017/dispatcher.vcxproj
+++ b/MSVC_NMake/dispatcher.vcxproj
diff --git a/MSVC_Net2017/dispatcher.vcxproj.filters b/MSVC_NMake/dispatcher.vcxproj.filters
index c7d81a08..c7d81a08 100644
--- a/MSVC_Net2017/dispatcher.vcxproj.filters
+++ b/MSVC_NMake/dispatcher.vcxproj.filters
diff --git a/MSVC_Net2017/dispatcher2.vcxproj b/MSVC_NMake/dispatcher2.vcxproj
index a9f8e258..a9f8e258 100644
--- a/MSVC_Net2017/dispatcher2.vcxproj
+++ b/MSVC_NMake/dispatcher2.vcxproj
diff --git a/MSVC_Net2017/dispatcher2.vcxproj.filters b/MSVC_NMake/dispatcher2.vcxproj.filters
index b53d4e95..b53d4e95 100644
--- a/MSVC_Net2017/dispatcher2.vcxproj.filters
+++ b/MSVC_NMake/dispatcher2.vcxproj.filters
diff --git a/MSVC_Net2017/filelist.am b/MSVC_NMake/filelist.am
index e22b371f..e22b371f 100644
--- a/MSVC_Net2017/filelist.am
+++ b/MSVC_NMake/filelist.am
diff --git a/MSVC_Net2017/gendef.vcxproj b/MSVC_NMake/gendef.vcxproj
index bfc870be..bfc870be 100644
--- a/MSVC_Net2017/gendef.vcxproj
+++ b/MSVC_NMake/gendef.vcxproj
diff --git a/MSVC_Net2017/gendef.vcxproj.filters b/MSVC_NMake/gendef.vcxproj.filters
index d8cb693f..d8cb693f 100644
--- a/MSVC_Net2017/gendef.vcxproj.filters
+++ b/MSVC_NMake/gendef.vcxproj.filters
diff --git a/MSVC_Net2017/gendef/gendef.cc b/MSVC_NMake/gendef/gendef.cc
index d18ac9fb..d18ac9fb 100644
--- a/MSVC_Net2017/gendef/gendef.cc
+++ b/MSVC_NMake/gendef/gendef.cc
diff --git a/MSVC_Net2017/giomm.vcxproj b/MSVC_NMake/giomm.vcxproj
index 419673a3..419673a3 100644
--- a/MSVC_Net2017/giomm.vcxproj
+++ b/MSVC_NMake/giomm.vcxproj
diff --git a/MSVC_Net2017/giomm.vcxproj.filters b/MSVC_NMake/giomm.vcxproj.filters
index 5ed29e30..5ed29e30 100644
--- a/MSVC_Net2017/giomm.vcxproj.filters
+++ b/MSVC_NMake/giomm.vcxproj.filters
diff --git a/MSVC_Net2017/giomm/giomm.rc.in b/MSVC_NMake/giomm/giomm.rc.in
index c2335f89..c2335f89 100644
--- a/MSVC_Net2017/giomm/giomm.rc.in
+++ b/MSVC_NMake/giomm/giomm.rc.in
diff --git a/MSVC_Net2017/giomm_simple.vcxproj b/MSVC_NMake/giomm_simple.vcxproj
index bb945b46..bb945b46 100644
--- a/MSVC_Net2017/giomm_simple.vcxproj
+++ b/MSVC_NMake/giomm_simple.vcxproj
diff --git a/MSVC_Net2017/giomm_simple.vcxproj.filters b/MSVC_NMake/giomm_simple.vcxproj.filters
index 6f87c63f..6f87c63f 100644
--- a/MSVC_Net2017/giomm_simple.vcxproj.filters
+++ b/MSVC_NMake/giomm_simple.vcxproj.filters
diff --git a/MSVC_Net2017/glibmm-build-defines.props b/MSVC_NMake/glibmm-build-defines.props
index 91d6088b..91d6088b 100644
--- a/MSVC_Net2017/glibmm-build-defines.props
+++ b/MSVC_NMake/glibmm-build-defines.props
diff --git a/MSVC_Net2017/glibmm-install.props b/MSVC_NMake/glibmm-install.props
index e4f6339b..e4f6339b 100644
--- a/MSVC_Net2017/glibmm-install.props
+++ b/MSVC_NMake/glibmm-install.props
diff --git a/MSVC_Net2017/glibmm-version-paths.props b/MSVC_NMake/glibmm-version-paths.props
index 28b8cb9d..28b8cb9d 100644
--- a/MSVC_Net2017/glibmm-version-paths.props
+++ b/MSVC_NMake/glibmm-version-paths.props
diff --git a/MSVC_Net2017/glibmm.sln b/MSVC_NMake/glibmm.sln
index 4467ac17..4467ac17 100644
--- a/MSVC_Net2017/glibmm.sln
+++ b/MSVC_NMake/glibmm.sln
diff --git a/MSVC_Net2017/glibmm.vcxproj b/MSVC_NMake/glibmm.vcxproj
index e9eb0584..e9eb0584 100644
--- a/MSVC_Net2017/glibmm.vcxproj
+++ b/MSVC_NMake/glibmm.vcxproj
diff --git a/MSVC_Net2017/glibmm.vcxproj.filters b/MSVC_NMake/glibmm.vcxproj.filters
index f8e2680b..f8e2680b 100644
--- a/MSVC_Net2017/glibmm.vcxproj.filters
+++ b/MSVC_NMake/glibmm.vcxproj.filters
diff --git a/MSVC_Net2017/glibmm/glibmm.rc.in b/MSVC_NMake/glibmm/glibmm.rc.in
index 548ac23f..548ac23f 100644
--- a/MSVC_Net2017/glibmm/glibmm.rc.in
+++ b/MSVC_NMake/glibmm/glibmm.rc.in
diff --git a/MSVC_Net2017/glibmm_value.vcxproj b/MSVC_NMake/glibmm_value.vcxproj
index e191a1c8..e191a1c8 100644
--- a/MSVC_Net2017/glibmm_value.vcxproj
+++ b/MSVC_NMake/glibmm_value.vcxproj
diff --git a/MSVC_Net2017/glibmm_value.vcxproj.filters b/MSVC_NMake/glibmm_value.vcxproj.filters
index 80e9bb76..80e9bb76 100644
--- a/MSVC_Net2017/glibmm_value.vcxproj.filters
+++ b/MSVC_NMake/glibmm_value.vcxproj.filters
diff --git a/MSVC_Net2017/install.vcxproj b/MSVC_NMake/install.vcxproj
index 4b18af21..4b18af21 100644
--- a/MSVC_Net2017/install.vcxproj
+++ b/MSVC_NMake/install.vcxproj
diff --git a/MSVC_Net2017/keyfile.vcxproj b/MSVC_NMake/keyfile.vcxproj
index ed71d95c..ed71d95c 100644
--- a/MSVC_Net2017/keyfile.vcxproj
+++ b/MSVC_NMake/keyfile.vcxproj
diff --git a/MSVC_Net2017/keyfile.vcxproj.filters b/MSVC_NMake/keyfile.vcxproj.filters
index dea2aa95..dea2aa95 100644
--- a/MSVC_Net2017/keyfile.vcxproj.filters
+++ b/MSVC_NMake/keyfile.vcxproj.filters
diff --git a/MSVC_Net2017/markup.vcxproj b/MSVC_NMake/markup.vcxproj
index 60fb2c44..60fb2c44 100644
--- a/MSVC_Net2017/markup.vcxproj
+++ b/MSVC_NMake/markup.vcxproj
diff --git a/MSVC_Net2017/markup.vcxproj.filters b/MSVC_NMake/markup.vcxproj.filters
index 245f5714..245f5714 100644
--- a/MSVC_Net2017/markup.vcxproj.filters
+++ b/MSVC_NMake/markup.vcxproj.filters
diff --git a/MSVC_Net2017/options.vcxproj b/MSVC_NMake/options.vcxproj
index 3ba9d671..3ba9d671 100644
--- a/MSVC_Net2017/options.vcxproj
+++ b/MSVC_NMake/options.vcxproj
diff --git a/MSVC_Net2017/options.vcxproj.filters b/MSVC_NMake/options.vcxproj.filters
index 53f47f4c..53f47f4c 100644
--- a/MSVC_Net2017/options.vcxproj.filters
+++ b/MSVC_NMake/options.vcxproj.filters
diff --git a/MSVC_Net2017/properties.vcxproj b/MSVC_NMake/properties.vcxproj
index aafebf5c..aafebf5c 100644
--- a/MSVC_Net2017/properties.vcxproj
+++ b/MSVC_NMake/properties.vcxproj
diff --git a/MSVC_Net2017/properties.vcxproj.filters b/MSVC_NMake/properties.vcxproj.filters
index a9825fd9..a9825fd9 100644
--- a/MSVC_Net2017/properties.vcxproj.filters
+++ b/MSVC_NMake/properties.vcxproj.filters
diff --git a/MSVC_Net2017/regex.vcxproj b/MSVC_NMake/regex.vcxproj
index 490b1b6c..490b1b6c 100644
--- a/MSVC_Net2017/regex.vcxproj
+++ b/MSVC_NMake/regex.vcxproj
diff --git a/MSVC_Net2017/regex.vcxproj.filters b/MSVC_NMake/regex.vcxproj.filters
index 96dea5e1..96dea5e1 100644
--- a/MSVC_Net2017/regex.vcxproj.filters
+++ b/MSVC_NMake/regex.vcxproj.filters
diff --git a/MSVC_Net2017/resolver.vcxproj b/MSVC_NMake/resolver.vcxproj
index b6461be0..b6461be0 100644
--- a/MSVC_Net2017/resolver.vcxproj
+++ b/MSVC_NMake/resolver.vcxproj
diff --git a/MSVC_Net2017/resolver.vcxproj.filters b/MSVC_NMake/resolver.vcxproj.filters
index 2c9dc796..2c9dc796 100644
--- a/MSVC_Net2017/resolver.vcxproj.filters
+++ b/MSVC_NMake/resolver.vcxproj.filters
diff --git a/MSVC_Net2017/socket-client.vcxproj b/MSVC_NMake/socket-client.vcxproj
index 5058f19d..5058f19d 100644
--- a/MSVC_Net2017/socket-client.vcxproj
+++ b/MSVC_NMake/socket-client.vcxproj
diff --git a/MSVC_Net2017/socket-client.vcxproj.filters b/MSVC_NMake/socket-client.vcxproj.filters
index edb14c14..edb14c14 100644
--- a/MSVC_Net2017/socket-client.vcxproj.filters
+++ b/MSVC_NMake/socket-client.vcxproj.filters
diff --git a/MSVC_Net2017/socket-server.vcxproj b/MSVC_NMake/socket-server.vcxproj
index b925f87d..b925f87d 100644
--- a/MSVC_Net2017/socket-server.vcxproj
+++ b/MSVC_NMake/socket-server.vcxproj
diff --git a/MSVC_Net2017/socket-server.vcxproj.filters b/MSVC_NMake/socket-server.vcxproj.filters
index 66a88d3a..66a88d3a 100644
--- a/MSVC_Net2017/socket-server.vcxproj.filters
+++ b/MSVC_NMake/socket-server.vcxproj.filters
diff --git a/MSVC_Net2017/thread.vcxproj b/MSVC_NMake/thread.vcxproj
index 24e9b3b1..24e9b3b1 100644
--- a/MSVC_Net2017/thread.vcxproj
+++ b/MSVC_NMake/thread.vcxproj
diff --git a/MSVC_Net2017/thread.vcxproj.filters b/MSVC_NMake/thread.vcxproj.filters
index ba19e27b..ba19e27b 100644
--- a/MSVC_Net2017/thread.vcxproj.filters
+++ b/MSVC_NMake/thread.vcxproj.filters
diff --git a/MSVC_Net2017/threadpool.vcxproj b/MSVC_NMake/threadpool.vcxproj
index 4ff8ebe9..4ff8ebe9 100644
--- a/MSVC_Net2017/threadpool.vcxproj
+++ b/MSVC_NMake/threadpool.vcxproj
diff --git a/MSVC_Net2017/threadpool.vcxproj.filters b/MSVC_NMake/threadpool.vcxproj.filters
index 4069cf59..4069cf59 100644
--- a/MSVC_Net2017/threadpool.vcxproj.filters
+++ b/MSVC_NMake/threadpool.vcxproj.filters
diff --git a/Makefile.am b/Makefile.am
index 7cda466d..f497ffef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,10 +43,10 @@ nodist_giomm_libinclude_HEADERS = gio/giommconfig.h
 pkgconfigdir = $(libdir)/pkgconfig
 nodist_pkgconfig_DATA = glib/$(GLIBMM_MODULE_NAME).pc gio/$(GIOMM_MODULE_NAME).pc
 
-include $(srcdir)/MSVC_Net2017/filelist.am
+include $(srcdir)/MSVC_NMake/filelist.am
 
 text_files = COPYING.tools README.SUN README.win32
-msvc_files = $(addprefix MSVC_Net2017/,$(msvc_net2017_data))
+msvc_files = $(addprefix MSVC_NMake/,$(msvc_net2017_data))
 
 dist_noinst_DATA = $(text_files) $(msvc_files)
 dist_noinst_SCRIPTS = autogen.sh
diff --git a/README.win32 b/README.win32
index 0094f745..d6b8019f 100644
--- a/README.win32
+++ b/README.win32
@@ -46,7 +46,7 @@ make install
 

 2. MS Visual Studio 2017

 

-Open the glibmm.sln solution file in the MSVC_Net2017 directory. In

+Open the glibmm.sln solution file in the MSVC_NMake directory. In

 the Tools/Options panel, add the appropriate GTK+ include and lib

 directories to the Projects and Solutions/VC++ directories, if they

 are not in the locations specified by the property sheets, i.e.

diff --git a/configure.ac b/configure.ac
index 6f435373..e8228bdb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,12 +169,12 @@ AC_CONFIG_FILES([Makefile
                  examples/Makefile
                  docs/Makefile
                  docs/reference/Doxyfile
-                 MSVC_Net2017/glibmm/glibmm.rc
-                 MSVC_Net2017/giomm/giomm.rc])
+                 MSVC_NMake/glibmm/glibmm.rc
+                 MSVC_NMake/giomm/giomm.rc])
 
 # Copy the generated configuration headers into the MSVC project directories.
-AC_CONFIG_COMMANDS([MSVC_Net2017/glibmm/glibmmconfig.h],
-                   [cp -f glib/glibmmconfig.h MSVC_Net2017/glibmm/glibmmconfig.h])
-AC_CONFIG_COMMANDS([MSVC_Net2017/giomm/giommconfig.h],
-                   [cp -f gio/giommconfig.h MSVC_Net2017/giomm/giommconfig.h])
+AC_CONFIG_COMMANDS([MSVC_NMake/glibmm/glibmmconfig.h],
+                   [cp -f glib/glibmmconfig.h MSVC_NMake/glibmm/glibmmconfig.h])
+AC_CONFIG_COMMANDS([MSVC_NMake/giomm/giommconfig.h],
+                   [cp -f gio/giommconfig.h MSVC_NMake/giomm/giommconfig.h])
 AC_OUTPUT