[gtkmm/kjellahl/meson-build-master: 5/7] NMake Makefiles: Support building from Meson tarballs

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

commit 691779c0ed2e82e07b027ecb9180bfe650971fce
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Jun 4 17:52:39 2020 +0800

    NMake Makefiles: Support building from Meson tarballs
    
    Make the NMake Makefiles look for the sources and headers in
    $(srcroot)/untracked as well.  This allows builds from Meson-generated release
    tarballs directly using NMake after running
    'nmake /f Makefile.vc CFG=$(CFG) prep-git-build'

 MSVC_NMake/build-rules-msvc.mak | 18 ++++++++++++++++--
 MSVC_NMake/config-msvc.mak      |  2 ++
 2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/MSVC_NMake/build-rules-msvc.mak b/MSVC_NMake/build-rules-msvc.mak
index 66fc13a9..2ccfb240 100644
--- a/MSVC_NMake/build-rules-msvc.mak
+++ b/MSVC_NMake/build-rules-msvc.mak
@@ -18,6 +18,12 @@
 $<
 <<
 
+{..\untracked\gdk\gdkmm\}.cc{vs$(VSVER)\$(CFG)\$(PLAT)\gdkmm\}.obj::
+       @if not exist vs$(VSVER)\$(CFG)\$(PLAT)\gdkmm\ md vs$(VSVER)\$(CFG)\$(PLAT)\gdkmm
+       $(CXX) $(LIBGDKMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(VSVER)\$(CFG)\$(PLAT)\gdkmm\ 
/Fdvs$(VSVER)\$(CFG)\$(PLAT)\gdkmm\ /c @<<
+$<
+<<
+
 {..\gdk\gdkmm\}.cc{vs$(VSVER)\$(CFG)\$(PLAT)\gdkmm\}.obj::
        @if not exist vs$(VSVER)\$(CFG)\$(PLAT)\gdkmm\ md vs$(VSVER)\$(CFG)\$(PLAT)\gdkmm
        $(CXX) $(LIBGDKMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(VSVER)\$(CFG)\$(PLAT)\gdkmm\ 
/Fdvs$(VSVER)\$(CFG)\$(PLAT)\gdkmm\ /c @<<
@@ -26,9 +32,10 @@ $<
 
 {..\gdk\src\}.ccg{vs$(VSVER)\$(CFG)\$(PLAT)\gdkmm\}.obj:
        @if not exist $(@D)\private\ md $(@D)\private
-       @for %%s in ($(<D)\*.ccg) do @if not exist ..\gdk\gdkmm\%%~ns.cc if not exist $(@D)\%%~ns.cc $(PERL) 
-- $(GMMPROC_DIR)/gmmproc -I ../tools/m4 -I $(GMMPROC_PANGO_DIR) -I $(GMMPROC_ATK_DIR) --defs $(<D:\=/) %%~ns 
$(<D:\=/) $(@D)
+       @for %%s in ($(<D)\*.ccg) do @if not exist ..\untracked\gdk\gdkmm\%%~ns.cc if not exist 
..\gdk\gdkmm\%%~ns.cc if not exist $(@D)\%%~ns.cc $(PERL) -- $(GMMPROC_DIR)/gmmproc -I ../tools/m4 -I 
$(GMMPROC_PANGO_DIR) -I $(GMMPROC_ATK_DIR) --defs $(<D:\=/) %%~ns $(<D:\=/) $(@D)
        @if exist $(@D)\$(<B).cc $(CXX) $(LIBGDKMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\ /Fd$(@D)\ /c 
$(@D)\$(<B).cc
        @if exist ..\gdk\gdkmm\$(<B).cc $(CXX) $(LIBGDKMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\ /Fd$(@D)\ /c 
..\gdk\gdkmm\$(<B).cc
+       @if exist ..\untracked\gdk\gdkmm\$(<B).cc $(CXX) $(LIBGDKMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\ 
/Fd$(@D)\ /c ..\untracked\gdk\gdkmm\$(<B).cc
 
 {vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm\}.cc{vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm\}.obj::
        $(CXX) $(LIBGTKMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(VSVER)\$(CFG)\$(PLAT)\gtkmm\ 
/Fdvs$(VSVER)\$(CFG)\$(PLAT)\gtkmm\ /c @<<
@@ -41,11 +48,18 @@ $<
 $<
 <<
 
+{..\untracked\gtk\gtkmm\}.cc{vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm\}.obj::
+       @if not exist vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm\ md vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm
+       $(CXX) $(LIBGTKMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(VSVER)\$(CFG)\$(PLAT)\gtkmm\ 
/Fdvs$(VSVER)\$(CFG)\$(PLAT)\gtkmm\ /c @<<
+$<
+<<
+
 {..\gtk\src\}.ccg{vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm\}.obj:
        @if not exist $(@D)\private\ md $(@D)\private
-       @for %%s in ($(<D)\*.ccg) do @if not exist ..\gtk\gtkmm\%%~ns.cc if not exist $(@D)\%%~ns.cc $(PERL) 
-- $(GMMPROC_DIR)/gmmproc -I ../tools/m4 -I $(GMMPROC_PANGO_DIR) -I $(GMMPROC_ATK_DIR) --defs $(<D:\=/) %%~ns 
$(<D:\=/) $(@D)
+       @for %%s in ($(<D)\*.ccg) do @if not exist ..\untracked\gtk\gtkmm\%%~ns.cc if not exist 
..\gtk\gtkmm\%%~ns.cc if not exist $(@D)\%%~ns.cc $(PERL) -- $(GMMPROC_DIR)/gmmproc -I ../tools/m4 -I 
$(GMMPROC_PANGO_DIR) -I $(GMMPROC_ATK_DIR) --defs $(<D:\=/) %%~ns $(<D:\=/) $(@D)
        @if exist $(@D)\$(<B).cc $(CXX) $(LIBGTKMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\ /Fd$(@D)\ /c 
$(@D)\$(<B).cc
        @if exist ..\gtk\gtkmm\$(<B).cc $(CXX) $(LIBGTKMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\ /Fd$(@D)\ /c 
..\gtk\gtkmm\$(<B).cc
+       @if exist ..\untracked\gtk\gtkmm\$(<B).cc $(CXX) $(LIBGTKMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\ 
/Fd$(@D)\ /c ..\untracked\gtk\gtkmm\$(<B).cc
 
 {.\gtkmm\}.rc{vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm\}.res:
        @if not exist $(@D)\ md $(@D)
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index f9f9f447..ddbd2903 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -158,12 +158,14 @@ GTKMM_DEMO_DEP_LIBS = $(GTKMM_DEP_LIBS) $(EPOXY_LIB)
 # CXXFLAGS
 GDKMM_BASE_CFLAGS =            \
        /Ivs$(VSVER)\$(CFG)\$(PLAT)     \
+       /I..\untracked\gdk /I..\untracked\gdk\gdkmm     \
        /I..\gdk /I.\gdkmm      \
        /wd4251 /wd4275 /wd4530 /std:c++17      \
        /FImsvc_recommended_pragmas.h /utf-8
 
 GTKMM_BASE_CFLAGS =            \
        /Ivs$(VSVER)\$(CFG)\$(PLAT)     \
+       /I..\untracked\gtk /I..\untracked\gtk\gtkmm     \
        /I..\gtk /I.\gtkmm      \
        /wd4250                         \
        $(GDKMM_BASE_CFLAGS)