build: Add NMake Makefiles

This will replace the Visual Studio 2013 projects, which is easier to
maitain and will let us build cairomm with Visual Studio 2015 or 2017
easier (and, 2013 is no longer supported as it does not have enough
C++-11 support).

For the C++-11 version of cairomm, since Visual Studio 2015 and 2017
both link to the Windows v140 C/C++ runtime DLLs, the DLLs and .lib's
are named as cairomm-vc140-1_0.[dll|lib] or cairomm-vc140-d-1_0.[dll|lib].

12 files changed, 554 insertions, 32 deletions

diff --git a/MSVC_NMake/Makefile.vc b/MSVC_NMake/Makefile.vc
new file mode 100644
index 0000000..0f1df15
--- /dev/null
+++ b/MSVC_NMake/Makefile.vc
@@ -0,0 +1,55 @@
+# NMake Makefile for building libsigc++ on Windows using Visual Studio
+
+# The items below this line should not be changed, unless one is maintaining
+# the NMake Makefiles.  Customizations can be done in the following NMake Makefile
+# portions (please see comments in the these files to see what can be customized):
+#
+# detectenv-msvc.mak
+# config-msvc.mak
+
+!include detectenv-msvc.mak
+
+# Include the Makefile portions with the source listings
+!include ..\cairomm\filelist.am
+
+# Include the Makefile portion that enables features based on user input
+!include config-msvc.mak
+
+!if "$(VALID_CFGSET)" == "TRUE"
+
+# We need Visual Studio 2015 or later
+!if $(VSVER) < 14
+VALID_MSC = FALSE
+!else
+VALID_MSC = TRUE
+!endif
+
+!if "$(VALID_MSC)" == "TRUE"
+
+# Include the Makefile portion to convert the source and header lists
+# into the lists we need for compilation and introspection
+!include create-lists-msvc.mak
+
+all: $(CAIROMM_LIB) $(cairomm_ex) all-build-info
+
+tests: $(cairomm_tests) all-build-info
+
+# Include the build rules for sources, DLLs and executables
+!include generate-msvc.mak
+!include build-rules-msvc.mak
+
+!include install.mak
+
+!else # "$(VALID_MSC)" == "TRUE"
+all:
+	@echo You need Visual Studio 2015 or later.
+
+!endif # "$(VALID_MSC)" == "TRUE"
+
+!else # "$(VALID_CFGSET)" == "TRUE"
+all: help
+	@echo You need to specify a valid configuration, via
+	@echo CFG=release or CFG=debug
+!endif # "$(VALID_CFGSET)" == "TRUE"
+
+!include info-msvc.mak
diff --git a/MSVC_NMake/README b/MSVC_NMake/README
index e1f237d..4466b25 100644
--- a/MSVC_NMake/README
+++ b/MSVC_NMake/README
@@ -1,11 +1,13 @@
-Building cairomm-1.0 with Visual Studio .NET 2013
+Building cairomm with Visual Studio .NET 2015 or later
 
-* You will need Visual Studio 2013 (MSVC 12.0).  Building with Visual Studio 2012 or earlier is no longer supported.
+* You will need Visual Studio 2015 (MSVC 14.0) or later.  Building with Visual Studio 2015 or earlier is no longer
+  supported.
 * Install the latest Win32 GTK+ Development files from ftp://ftp.gnome.org/pub/GNOME/binaries/win32/gtk+/ and add
-  the paths to headers and import libraries to Visual Studio, if they are not already in $(srcroot)/../vs12/$(Platform).
-* Load the MSVC_Net2013/cairomm.sln solution.
-* Build the entire solution.
-* Run the tests.
+  the paths to headers and import libraries to Visual Studio, if they are not already in
+  $(srcroot)/../vs$(VSVER)/$(Platform).
+* In a Visual Studio command prompt, go to $(srcroot)\MSVC_NMake
+* Build using nmake /f Makefile.vc CFG=[release|debug]
+* Run the tests (not currently buildable).
 
 Cedric Gustin
 08/18/2006
@@ -15,3 +17,4 @@ Armin Burgmeier
 
 Chun-wei Fan
 09/10/2015
+10/26/2018
diff --git a/MSVC_NMake/build-rules-msvc.mak b/MSVC_NMake/build-rules-msvc.mak
new file mode 100644
index 0000000..77b49cb
--- /dev/null
+++ b/MSVC_NMake/build-rules-msvc.mak
@@ -0,0 +1,87 @@
+# NMake Makefile portion for compilation rules
+# Items in here should not need to be edited unless
+# one is maintaining the NMake build files.  The format
+# of NMake Makefiles here are different from the GNU
+# Makefiles.  Please see the comments about these formats.
+
+# Inference rules for compiling the .obj files.
+# Used for libs and programs with more than a single source file.
+# Format is as follows
+# (all dirs must have a trailing '\'):
+#
+# {$(srcdir)}.$(srcext){$(destdir)}.obj::
+# 	$(CC)|$(CXX) $(cflags) /Fo$(destdir) /c @<<
+# $<
+# <<
+{..\cairomm\}.cc{$(CFG)\$(PLAT)\cairomm\}.obj::
+	$(CXX) $(LIBCAIROMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(CFG)\$(PLAT)\cairomm\ /c @<<
+$<
+<<
+
+{.\cairomm\}.rc{$(CFG)\$(PLAT)\cairomm\}.res:
+	rc /fo$@ $<
+
+# Rules for building .lib files
+$(CAIROMM_LIB): $(CAIROMM_DLL)
+
+# Rules for linking DLLs
+# Format is as follows (the mt command is needed for MSVC 2005/2008 builds):
+# $(dll_name_with_path): $(dependent_libs_files_objects_and_items)
+#	link /DLL [$(linker_flags)] [$(dependent_libs)] [/def:$(def_file_if_used)] [/implib:$(lib_name_if_needed)] -out:$@ @<<
+# $(dependent_objects)
+# <<
+# 	@-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;2
+$(CAIROMM_DLL): $(CFG)\$(PLAT)\cairomm\cairomm.def $(cairomm_OBJS)
+	link /DLL $(LDFLAGS_NOLTCG) $(CAIRO_LIB) $(LIBSIGC_LIB) /implib:$(CAIROMM_LIB) /def:$(CFG)\$(PLAT)\cairomm\cairomm.def -out:$@ @<<
+$(cairomm_OBJS)
+<<
+	@-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;2
+
+# Rules for linking Executables
+# Format is as follows (the mt command is needed for MSVC 2005/2008 builds):
+# $(dll_name_with_path): $(dependent_libs_files_objects_and_items)
+#	link [$(linker_flags)] [$(dependent_libs)] -out:$@ @<<
+# $(dependent_objects)
+# <<
+# 	@-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;1
+
+{.\gendef\}.cc{$(CFG)\$(PLAT)\}.exe:
+	@if not exist $(CFG)\$(PLAT)\gendef\ $(MAKE) -f Makefile.vc CFG=$(CFG) $(CFG)\$(PLAT)\gendef
+	$(CXX) $(CAIROMM_BASE_CFLAGS) $(CFLAGS) /Fo$(CFG)\$(PLAT)\gendef\ $< /link $(LDFLAGS) /out:$@
+
+{..\examples\text\}.cc{$(CFG)\$(PLAT)\}.exe:
+	@if not exist $(CFG)\$(PLAT)\cairomm-ex $(MAKE) -f Makefile.vc CFG=$(CFG) $(CFG)\$(PLAT)\cairomm-ex
+	@if not exist $(CAIROMM_LIB) $(MAKE) -f Makefile.vc CFG=$(CFG) $(CAIROMM_LIB)
+	$(CXX) $(CAIROMM_EX_CFLAGS) $(CFLAGS) /Fo$(CFG)\$(PLAT)\cairomm-ex\ $< /Fe$@ /link $(LDFLAGS) $(CAIROMM_LIB) $(LIBSIGC_LIB) $(CAIRO_LIB)
+	@-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;1
+
+{..\examples\surfaces\}.cc{$(CFG)\$(PLAT)\}.exe:
+	@if not exist $(CFG)\$(PLAT)\cairomm-ex $(MAKE) -f Makefile.vc CFG=$(CFG) $(CFG)\$(PLAT)\cairomm-ex
+	@if not exist $(CAIROMM_LIB) $(MAKE) -f Makefile.vc CFG=$(CFG) $(CAIROMM_LIB)
+	$(CXX) $(CAIROMM_EX_CFLAGS) $(CFLAGS) /Fo$(CFG)\$(PLAT)\cairomm-ex\ $< /Fe$@ /link $(LDFLAGS) $(CAIROMM_LIB) $(LIBSIGC_LIB) $(CAIRO_LIB)
+	@-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;1
+
+{..\tests\}.cc{$(CFG)\$(PLAT)\}.exe:
+	@if not exist $(CAIROMM_LIB) $(MAKE) -f Makefile.vc CFG=$(CFG) $(CAIROMM_LIB)
+	@if not exist $(CFG)\$(PLAT)\cairomm-tests $(MAKE) -f Makefile.vc CFG=$(CFG) $(CFG)\$(PLAT)\cairomm-tests
+	$(CXX) $(CAIROMM_EX_CFLAGS) $(CFLAGS) /Fo$(CFG)\$(PLAT)\cairomm-tests\ $< /Fe$@ /link $(LDFLAGS) $(CAIROMM_LIB) $(LIBSIGC_LIB) $(CAIRO_LIB)
+	@-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;1
+
+clean:
+	@-del /f /q $(CFG)\$(PLAT)\*.exe
+	@-del /f /q $(CFG)\$(PLAT)\*.dll
+	@-del /f /q $(CFG)\$(PLAT)\*.pdb
+	@-del /f /q $(CFG)\$(PLAT)\*.ilk
+	@-del /f /q $(CFG)\$(PLAT)\*.exp
+	@-del /f /q $(CFG)\$(PLAT)\*.lib
+	@-if exist $(CFG)\$(PLAT)\cairomm-tests del /f /q $(CFG)\$(PLAT)\cairomm-tests\*.obj
+	@-del /f /q $(CFG)\$(PLAT)\cairomm-ex\*.obj
+	@-del /f /q $(CFG)\$(PLAT)\cairomm\*.res
+	@-del /f /q $(CFG)\$(PLAT)\cairomm\*.def
+	@-del /f /q $(CFG)\$(PLAT)\cairomm\*.obj
+	@-del /f /q $(CFG)\$(PLAT)\gendef\*.obj
+	@-if exist $(CFG)\$(PLAT)\cairomm-tests rd $(CFG)\$(PLAT)\cairomm-tests
+	@-rd $(CFG)\$(PLAT)\cairomm-ex
+	@-rd $(CFG)\$(PLAT)\cairomm
+	@-rd $(CFG)\$(PLAT)\gendef
+	@-del /f /q vc$(PDBVER)0.pdb
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
new file mode 100644
index 0000000..69d26bc
--- /dev/null
+++ b/MSVC_NMake/config-msvc.mak
@@ -0,0 +1,55 @@
+# NMake Makefile portion for enabling features for Windows builds
+
+# These are the base minimum libraries required for building cairomm.
+BASE_INCLUDES =	/I$(PREFIX)\include
+
+# Please do not change anything beneath this line unless maintaining the NMake Makefiles
+
+CAIROMM_MAJOR_VERSION = 1
+CAIROMM_MINOR_VERSION = 0
+
+LIBSIGC_MAJOR_VERSION = 2
+LIBSIGC_MINOR_VERSION = 0
+
+!if "$(CFG)" == "debug" || "$(CFG)" == "Debug"
+DEBUG_SUFFIX = -d
+!else
+DEBUG_SUFFIX =
+!endif
+
+CAIROMM_BASE_CFLAGS =			\
+	/D_CRT_SECURE_NO_WARNINGS	\
+	/D_CRT_NONSTDC_NO_WARNINGS	\
+	/I.. /I.\cairomm		\
+	/D_USE_MATH_DEFINES		\
+	/wd4530
+
+CAIROMM_EXTRA_INCLUDES =	\
+	/I$(PREFIX)\include\sigc++-$(LIBSIGC_MAJOR_VERSION).$(LIBSIGC_MINOR_VERSION)	\
+	/I$(PREFIX)\lib\sigc++-$(LIBSIGC_MAJOR_VERSION).$(LIBSIGC_MINOR_VERSION)\include
+
+LIBCAIROMM_CFLAGS = /DCAIROMM_BUILD $(CAIROMM_BASE_CFLAGS) $(CAIROMM_EXTRA_INCLUDES)
+CAIROMM_EX_CFLAGS = $(CAIROMM_BASE_CFLAGS) $(CAIROMM_EXTRA_INCLUDES)
+
+CAIROMM_INT_SOURCES = $(cairomm_cc:/=\)
+CAIROMM_INT_HDRS = $(cairomm_public_h:/=\)
+
+# We build cairomm-vc$(PDBVER)0-$(CAIROMM_MAJOR_VERSION)_$(CAIROMM_MINOR_VERSION).dll or
+#          cairomm-vc$(PDBVER)0-d-$(CAIROMM_MAJOR_VERSION)_$(CAIROMM_MINOR_VERSION).dll at least
+
+LIBSIGC_LIBNAME = sigc-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(LIBSIGC_MAJOR_VERSION)_$(LIBSIGC_MINOR_VERSION)
+
+LIBSIGC_DLL = $(LIBSIGC_LIBNAME).dll
+LIBSIGC_LIB = $(LIBSIGC_LIBNAME).lib
+
+CAIROMM_LIBNAME = cairomm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(CAIROMM_MAJOR_VERSION)_$(CAIROMM_MINOR_VERSION)
+
+CAIROMM_DLL = $(CFG)\$(PLAT)\$(CAIROMM_LIBNAME).dll
+CAIROMM_LIB = $(CFG)\$(PLAT)\$(CAIROMM_LIBNAME).lib
+
+GENDEF = $(CFG)\$(PLAT)\gendef.exe
+CAIRO_LIB = cairo.lib
+
+!ifdef BOOST_DLL
+CAIROMM_EX_CFLAGS = $(CAIROMM_EX_CFLAGS) /DBOOST_ALL_DYN_LINK
+!endif
diff --git a/MSVC_NMake/create-lists-msvc.mak b/MSVC_NMake/create-lists-msvc.mak
new file mode 100644
index 0000000..5367fdc
--- /dev/null
+++ b/MSVC_NMake/create-lists-msvc.mak
@@ -0,0 +1,74 @@
+# Convert the source listing to object (.obj) listing in
+# another NMake Makefile module, include it, and clean it up.
+# This is a "fact-of-life" regarding NMake Makefiles...
+# This file does not need to be changed unless one is maintaining the NMake Makefiles
+
+# For those wanting to add things here:
+# To add a list, do the following:
+# # $(description_of_list)
+# if [call create-lists.bat header $(makefile_snippet_file) $(variable_name)]
+# endif
+#
+# if [call create-lists.bat file $(makefile_snippet_file) $(file_name)]
+# endif
+#
+# if [call create-lists.bat footer $(makefile_snippet_file)]
+# endif
+# ... (repeat the if [call ...] lines in the above order if needed)
+# !include $(makefile_snippet_file)
+#
+# (add the following after checking the entries in $(makefile_snippet_file) is correct)
+# (the batch script appends to $(makefile_snippet_file), you will need to clear the file unless the following line is added)
+#!if [del /f /q $(makefile_snippet_file)]
+#!endif
+
+# In order to obtain the .obj filename that is needed for NMake Makefiles to build DLLs/static LIBs or EXEs, do the following
+# instead when doing 'if [call create-lists.bat file $(makefile_snippet_file) $(file_name)]'
+# (repeat if there are multiple $(srcext)'s in $(source_list), ignore any headers):
+# !if [for %c in ($(source_list)) do @if "%~xc" == ".$(srcext)" @call create-lists.bat file $(makefile_snippet_file) $(intdir)\%~nc.obj]
+#
+# $(intdir)\%~nc.obj needs to correspond to the rules added in build-rules-msvc.mak
+# %~xc gives the file extension of a given file, %c in this case, so if %c is a.cc, %~xc means .cc
+# %~nc gives the file name of a given file without extension, %c in this case, so if %c is a.cc, %~nc means a
+
+NULL=
+
+# For cairomm
+
+!if [call create-lists.bat header cairomm.mak cairomm_OBJS]
+!endif
+
+!if [for %c in ($(cairomm_cc)) do @if "%~xc" == ".cc" @call create-lists.bat file cairomm.mak ^$(CFG)\^$(PLAT)\cairomm\%~nc.obj]
+!endif
+
+!if [@call create-lists.bat file cairomm.mak ^$(CFG)\^$(PLAT)\cairomm\cairomm.res]
+!endif
+
+!if [call create-lists.bat footer cairomm.mak]
+!endif
+
+!if [call create-lists.bat header cairomm.mak cairomm_ex]
+!endif
+
+!if [for %c in (..\examples\text\*.cc) do @call create-lists.bat file cairomm.mak ^$(CFG)\^$(PLAT)\%~nc.exe]
+!endif
+
+!if [for %c in (..\examples\surfaces\*.cc) do @call create-lists.bat file cairomm.mak ^$(CFG)\^$(PLAT)\%~nc.exe]
+!endif
+
+!if [call create-lists.bat footer cairomm.mak]
+!endif
+
+!if [call create-lists.bat header cairomm.mak cairomm_tests]
+!endif
+
+!if [for %c in (..\tests\*.cc) do @call create-lists.bat file cairomm.mak ^$(CFG)\^$(PLAT)\%~nc.exe]
+!endif
+
+!if [call create-lists.bat footer cairomm.mak]
+!endif
+
+!include cairomm.mak
+
+!if [del /f /q cairomm.mak]
+!endif
diff --git a/MSVC_NMake/create-lists.bat b/MSVC_NMake/create-lists.bat
new file mode 100644
index 0000000..ef60d5c
--- /dev/null
+++ b/MSVC_NMake/create-lists.bat
@@ -0,0 +1,42 @@
+@echo off
+rem Simple .bat script for creating the NMake Makefile snippets.
+
+if not "%1" == "header" if not "%1" == "file" if not "%1" == "footer" goto :error_cmd
+if "%2" == "" goto error_no_destfile
+
+if "%1" == "header" goto :header
+if "%1" == "file" goto :addfile
+if "%1" == "footer" goto :footer
+
+:header
+if "%3" == "" goto error_var
+echo %3 =	\>>%2
+goto done
+
+:addfile
+if "%3" == "" goto error_file
+echo.	%3	\>>%2
+goto done
+
+:footer
+echo.	$(NULL)>>%2
+echo.>>%2
+goto done
+
+:error_cmd
+echo Specified command '%1' was invalid.  Valid commands are: header file footer.
+goto done
+
+:error_no_destfile
+echo Destination NMake snippet file must be specified
+goto done
+
+:error_var
+echo A name must be specified for using '%1'.
+goto done
+
+:error_file
+echo A file must be specified for using '%1'.
+goto done
+
+:done
\ No newline at end of file
diff --git a/MSVC_NMake/detectenv-msvc.mak b/MSVC_NMake/detectenv-msvc.mak
new file mode 100644
index 0000000..9a92c11
--- /dev/null
+++ b/MSVC_NMake/detectenv-msvc.mak
@@ -0,0 +1,154 @@
+# Change this (or specify PREFIX= when invoking this NMake Makefile) if
+# necessary, so that the libs and headers of the dependent third-party
+# libraries can be located.  For instance, if building from GLib's
+# included Visual Studio projects, this should be able to locate the GLib
+# build out-of-the-box if they were not moved.  GLib's headers will be
+# found in $(GLIB_PREFIX)\include\glib-2.0 and
+# $(GLIB_PREFIX)\lib\glib-2.0\include and its import library will be found
+# in $(GLIB_PREFIX)\lib.
+
+!if "$(PREFIX)" == ""
+PREFIX = ..\..\vs$(VSVER)\$(PLAT)
+!endif
+
+# Location of the PERL interpreter, for running glib-mkenums.  glib-mkenums
+# needs to be found in $(PREFIX)\bin.  Using either a 32-bit or x64 PERL
+# interpreter are supported for either a 32-bit or x64 build.
+
+!if "$(PERL)" == ""
+PERL = perl
+!endif
+
+# Location of the Python interpreter, for building introspection.  The complete set
+# of Python Modules for introspection (the giscanner Python scripts and the _giscanner.pyd
+# compiled module) needs to be found in $(PREFIX)\lib\gobject-introspection\giscanner, and
+# the g-ir-scanner Python script and g-ir-compiler utility program needs to be found
+# in $(PREFIX)\bin, together with any DLLs they will depend on, if those DLLs are not already
+# in your PATH.
+# Note that the Python interpreter and the introspection modules and utility progam must
+# correspond to the build type (i.e. 32-bit Release for 32-bit Release builds, and so on).
+#
+# For introspection, currently only Python 2.7.x is supported.  This may change when Python 3.x
+# support is added upstream in gobject-introspection--when this happens, the _giscanner.pyd must
+# be the one that is built against the release series of Python that is used here.
+
+!if "$(PYTHON)" == ""
+PYTHON = python
+!endif
+
+# Location of the pkg-config utility program, for building introspection.  It needs to be able
+# to find the pkg-config (.pc) files so that the correct libraries and headers for the needed libraries
+# can be located, using PKG_CONFIG_PATH.  Using either a 32-bit or x64 pkg-config are supported for
+# either a 32-bit or x64 build.
+
+!if "$(PKG_CONFIG)" == ""
+PKG_CONFIG = pkg-config
+!endif
+
+# The items below this line should not be changed, unless one is maintaining
+# the NMake Makefiles.  The exception is for the CFLAGS_ADD line(s) where one
+# could use his/her desired compiler optimization flags, if he/she knows what is
+# being done.
+
+# Check to see we are configured to build with MSVC (MSDEVDIR, MSVCDIR or
+# VCINSTALLDIR) or with the MS Platform SDK (MSSDK or WindowsSDKDir)
+!if !defined(VCINSTALLDIR) && !defined(WINDOWSSDKDIR)
+MSG = ^
+This Makefile is only for Visual Studio 2008 and later.^
+You need to ensure that the Visual Studio Environment is properly set up^
+before running this Makefile.
+!error $(MSG)
+!endif
+
+ERRNUL  = 2>NUL
+_HASH=^#
+
+!if ![echo VCVERSION=_MSC_VER > vercl.x] \
+    && ![echo $(_HASH)if defined(_M_IX86) >> vercl.x] \
+    && ![echo PLAT=Win32 >> vercl.x] \
+    && ![echo $(_HASH)elif defined(_M_AMD64) >> vercl.x] \
+    && ![echo PLAT=x64 >> vercl.x] \
+    && ![echo $(_HASH)endif >> vercl.x] \
+    && ![cl -nologo -TC -P vercl.x $(ERRNUL)]
+!include vercl.i
+!if ![echo VCVER= ^\> vercl.vc] \
+    && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc]
+!include vercl.vc
+!endif
+!endif
+!if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc]
+!endif
+
+!if $(VCVERSION) > 1499 && $(VCVERSION) < 1600
+VSVER = 9
+!elseif $(VCVERSION) > 1599 && $(VCVERSION) < 1700
+VSVER = 10
+!elseif $(VCVERSION) > 1699 && $(VCVERSION) < 1800
+VSVER = 11
+!elseif $(VCVERSION) > 1799 && $(VCVERSION) < 1900
+VSVER = 12
+!elseif $(VCVERSION) > 1899 && $(VCVERSION) < 1910
+VSVER = 14
+!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 2000
+VSVER = 15
+!else
+VSVER = 0
+!endif
+
+!if "$(VSVER)" == "0"
+MSG = ^
+This NMake Makefile set supports Visual Studio^
+9 (2008) through 15 (2017).  Your Visual Studio^
+version is not supported.
+!error $(MSG)
+!else
+!if $(VSVER) < 15
+PDBVER = $(VSVER)
+!else
+PDBVER = 14
+!endif
+!endif
+
+VALID_CFGSET = FALSE
+!if "$(CFG)" == "release" || "$(CFG)" == "Release" || "$(CFG)" == "debug" || "$(CFG)" == "Debug"
+VALID_CFGSET = TRUE
+!endif
+
+# One may change these items, but be sure to test
+# the resulting binaries
+!if "$(CFG)" == "release" || "$(CFG)" == "Release"
+CFLAGS_ADD_NO_GL = /MD /O2 /MP
+CFLAGS_ADD = $(CFLAGS_ADD_NO_GL) /GL
+!if "$(VSVER)" != "9"
+CFLAGS_ADD = $(CFLAGS_ADD) /d2Zi+
+CFLAGS_ADD_NO_GL = $(CFLAGS_ADD_NO_GL) /d2Zi+
+!endif
+!else
+CFLAGS_ADD = /MDd /Od
+CFLAGS_ADD_NO_GL = $(CFLAGS_ADD)
+!endif
+
+!if "$(PLAT)" == "x64"
+LDFLAGS_ARCH = /machine:x64
+!else
+LDFLAGS_ARCH = /machine:x86
+!endif
+
+!if "$(VALID_CFGSET)" == "TRUE"
+CFLAGS_NOGL = $(CFLAGS_ADD_NO_GL) /W3 /Zi
+CFLAGS = $(CFLAGS_ADD) /W3 /Zi
+
+LDFLAGS_BASE = $(LDFLAGS_ARCH) /libpath:$(PREFIX)\lib /DEBUG
+
+!if "$(CFG)" == "debug" || "$(CFG)" == "Debug"
+ARFLAGS_NOLTCG = $(LDFLAGS_ARCH)
+ARFLAGS = $(LDFLAGS_ARCH)
+LDFLAGS_NOLTCG = $(LDFLAGS_BASE)
+LDFLAGS = $(LDFLAGS_BASE)
+!else
+ARFLAGS_NOLTCG = $(LDFLAGS_ARCH) /LTCG
+ARFLAGS = $(ARFLAGS_NOLTCG) /LTCG
+LDFLAGS_NOLTCG = $(LDFLAGS_BASE) /opt:ref
+LDFLAGS = $(LDFLAGS_NOLTCG) /LTCG
+!endif
+!endif
diff --git a/MSVC_NMake/filelist.am b/MSVC_NMake/filelist.am
index c526ee2..dfe199e 100644
--- a/MSVC_NMake/filelist.am
+++ b/MSVC_NMake/filelist.am
@@ -1,27 +1,16 @@
 ## This file is part of cairomm
 
-msvc_net2013_data = README \
-                    cairomm.sln \
-                    cairomm-build-defines.props \
-                    cairomm-version-paths.props \
-                    gendef.vcxproj \
-                    gendef.vcxproj.filters \
-                    gendef/gendef.cc \
-                    cairomm/cairommconfig.h \
-                    cairomm/cairomm.rc \
-                    cairomm.vcxproj \
-                    cairomm.vcxproj.filters \
-                    image-surface.vcxproj \
-                    image-surface.vcxproj.filters \
-                    pdf-surface.vcxproj \
-                    pdf-surface.vcxproj.filters \
-                    ps-surface.vcxproj \
-                    ps-surface.vcxproj.filters \
-                    svg-surface.vcxproj \
-                    svg-surface.vcxproj.filters \
-                    text-rotate.vcxproj \
-                    text-rotate.vcxproj.filters \
-                    toy-text.vcxproj \
-                    toy-text.vcxproj.filters \
-                    user-font.vcxproj \
-                    user-font.vcxproj.filters
+msvc_nmake_data =		\
+	build-rules-msvc.mak	\
+	cairomm/cairommconfig.h	\
+	cairomm/cairomm.rc	\
+	config-msvc.mak		\
+	create-lists.bat	\
+	create-lists-msvc.mak	\
+	detectenv-msvc.mak	\
+	info-msvc.mak		\
+	install.mak		\
+	gendef/gendef.cc	\
+	generate-msvc.mak	\
+	Makefile.vc		\
+	README
diff --git a/MSVC_NMake/generate-msvc.mak b/MSVC_NMake/generate-msvc.mak
new file mode 100644
index 0000000..4c39c98
--- /dev/null
+++ b/MSVC_NMake/generate-msvc.mak
@@ -0,0 +1,12 @@
+# NMake Makefile portion for code generation and
+# intermediate build directory creation
+# Items in here should not need to be edited unless
+# one is maintaining the NMake build files.
+
+# Create the build directories
+$(CFG)\$(PLAT)\gendef $(CFG)\$(PLAT)\cairomm $(CFG)\$(PLAT)\cairomm-ex $(CFG)\$(PLAT)\cairomm-tests:
+	@-mkdir $@
+
+# Generate .def files
+$(CFG)\$(PLAT)\cairomm\cairomm.def: $(GENDEF) $(CFG)\$(PLAT)\cairomm $(cairomm_OBJS)
+	$(CFG)\$(PLAT)\gendef.exe $@ $(CAIROMM_LIBNAME) $(CFG)\$(PLAT)\cairomm\*.obj
diff --git a/MSVC_NMake/info-msvc.mak b/MSVC_NMake/info-msvc.mak
new file mode 100644
index 0000000..2a79909
--- /dev/null
+++ b/MSVC_NMake/info-msvc.mak
@@ -0,0 +1,39 @@
+# NMake Makefile portion for displaying config info
+
+all-build-info:
+	@echo.
+	@echo ----------
+	@echo Build info
+	@echo ---------
+	@echo Build Type: $(CFG)
+
+help:
+	@echo.
+	@echo ============================
+	@echo Building cairomm Using NMake
+	@echo ============================
+	@echo nmake /f Makefile.vc CFG=[release^|debug] ^<PREFIX=PATH^>
+	@echo.
+	@echo Where:
+	@echo ------
+	@echo CFG: Required, use CFG=release for an optimized build and CFG=debug
+	@echo for a debug build.  PDB files are generated for all builds.
+	@echo.
+	@echo PREFIX: Optional, the path where dependent libraries and tools may be
+	@echo found, default is ^$(srcrootdir)\..\vs^$(short_vs_ver)\^$(platform),
+	@echo where ^$(short_vs_ver) is 15 for VS 2017 and so on; and
+	@echo ^$(platform) is Win32 for 32-bit builds and x64 for x64 builds.
+	@echo.
+	@echo ======
+	@echo A 'clean' target is supported to remove all generated files, intermediate
+	@echo object files and binaries for the specified configuration.
+	@echo.
+	@echo An 'install' target is supported to copy the build (DLLs, utility programs,
+	@echo LIBs, along with the introspection files if applicable) to appropriate
+	@echo locations under ^$(PREFIX).
+	@echo.
+	@echo A 'tests' target is supported to build the test programs.  Note that the
+	@echo Boost libraries are required.  Also pass in BOOST_DLL=1 if the installed
+	@echo Boost libraries are built as DLLs.
+	@echo ======
+	@echo.
diff --git a/MSVC_NMake/install.mak b/MSVC_NMake/install.mak
new file mode 100644
index 0000000..473117c
--- /dev/null
+++ b/MSVC_NMake/install.mak
@@ -0,0 +1,12 @@
+# NMake Makefile snippet for copying the built libraries, utilities and headers to
+# a path under $(PREFIX).
+
+install: all
+	@if not exist $(PREFIX)\bin\ mkdir $(PREFIX)\bin
+	@if not exist $(PREFIX)\lib\cairomm-$(CAIROMM_MAJOR_VERSION).$(CAIROMM_MINOR_VERSION)\include\ mkdir $(PREFIX)\lib\cairomm-$(CAIROMM_MAJOR_VERSION).$(CAIROMM_MINOR_VERSION)\include
+	@if not exist $(PREFIX)\include\cairomm-$(CAIROMM_MAJOR_VERSION).$(CAIROMM_MINOR_VERSION)\cairomm\ @mkdir $(PREFIX)\include\cairomm-$(CAIROMM_MAJOR_VERSION).$(CAIROMM_MINOR_VERSION)\cairomm
+	@copy /b $(CFG)\$(PLAT)\$(CAIROMM_LIBNAME).dll $(PREFIX)\bin
+	@copy /b $(CFG)\$(PLAT)\$(CAIROMM_LIBNAME).pdb $(PREFIX)\bin
+	@copy /b $(CFG)\$(PLAT)\$(CAIROMM_LIBNAME).lib $(PREFIX)\lib
+	@for %h in ($(cairomm_public_h)) do @copy "..\cairomm\%h" "$(PREFIX)\include\cairomm-$(CAIROMM_MAJOR_VERSION).$(CAIROMM_MINOR_VERSION)\cairomm\%h"
+	@copy ".\cairomm\cairommconfig.h" "$(PREFIX)\lib\cairomm-$(CAIROMM_MAJOR_VERSION).$(CAIROMM_MINOR_VERSION)\include\"
diff --git a/Makefile.am b/Makefile.am
index b373976..ff0de26 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,7 @@ nodist_pkgconfig_DATA = $(CAIROMM_INSTALL_PC)
 
 include $(srcdir)/MSVC_NMake/filelist.am
 
-msvc_files = $(addprefix MSVC_NMake/,$(msvc_net2013_data))
+msvc_files = $(addprefix MSVC_NMake/,$(msvc_nmake_data))
 
 dist_noinst_DATA = MAINTAINERS $(msvc_files)
 dist_noinst_SCRIPTS = autogen.sh