[atkmm/kjellahl/meson-build-master] NMake Makefiles: Support building from Meson-generated tarballs

[Chun-wei Fan <fanchunwei src gnome org>]

commit 4b25965cdbc950738ace6b2092e082b3ac91285c
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Apr 17 12:21:05 2020 +0800

    NMake Makefiles: Support building from Meson-generated tarballs
    
    This adds rules to the NMake Makefiles so that they will also look for the sources in
    untracked/.  One still need to use the 'prep-git-build' target to generate the full
    atkmmconfig.h and atkmm.rc source files for such release tarballs, if PERL is present,
    or manually edit those files from their .in templates to their full counterparts.

 MSVC_NMake/build-rules-msvc.mak | 6 ++++++
 MSVC_NMake/config-msvc.mak      | 1 +
 2 files changed, 7 insertions(+)
---
diff --git a/MSVC_NMake/build-rules-msvc.mak b/MSVC_NMake/build-rules-msvc.mak
index 4206ab8..de64f44 100644
--- a/MSVC_NMake/build-rules-msvc.mak
+++ b/MSVC_NMake/build-rules-msvc.mak
@@ -18,6 +18,11 @@
 $<
 <<
 
+{..\untracked\atk\atkmm\}.cc{vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\}.obj::
+       $(CXX) $(ATKMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(VSVER)\$(CFG)\$(PLAT)\atkmm\ 
/Fdvs$(VSVER)\$(CFG)\$(PLAT)\atkmm\ /c @<<
+$<
+<<
+
 {..\atk\atkmm\}.cc{vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\}.obj::
        $(CXX) $(ATKMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(VSVER)\$(CFG)\$(PLAT)\atkmm\ 
/Fdvs$(VSVER)\$(CFG)\$(PLAT)\atkmm\ /c @<<
 $<
@@ -27,6 +32,7 @@ $<
        @if not exist $(@D)\private\ $(MAKE) /f Makefile.vc CFG=$(CFG) $(@D)\private
        @for %%s in ($(<D)\*.ccg) do @if not exist ..\atk\atkmm\%%~ns.cc if not exist $(@D)\%%~ns.cc $(PERL) 
-- $(GMMPROC_DIR)/gmmproc -I ../codegen/m4 --defs $(<D:\=/) %%~ns $(<D:\=/) $(@D)
        @if exist $(@D)\$(<B).cc $(CXX) $(ATKMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\ /Fd$(@D)\ /c $(@D)\$(<B).cc
+       @if exist ..\untracked\atk\atkmm\$(<B).cc $(CXX) $(ATKMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\ /Fd$(@D)\ 
/c ..\untracked\atk\atkmm\$(<B).cc
        @if exist ..\atk\atkmm\$(<B).cc $(CXX) $(ATKMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\ /Fd$(@D)\ /c 
..\atk\atkmm\$(<B).cc
 
 {.\atkmm\}.rc{vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\}.res:
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index c770e18..3ea3072 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -28,6 +28,7 @@ GMMPROC_DIR=$(PREFIX)\share\glibmm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSIO
 
 ATKMM_BASE_CFLAGS =            \
        /Ivs$(VSVER)\$(CFG)\$(PLAT)     \
+       /I..\untracked\atk      \
        /I..\atk /I.\atkmm      \
        /wd4530 /wd4251 \
        /wd4275 /std:c++17      \