[pangomm/master.msvc.improvements] MSVC_NMake: Look for items in $(srcroot)/untracked too



commit 7da2cd53f16e898848afa307f66b13d83b8a1c01
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Feb 21 17:20:03 2020 +0800

    MSVC_NMake: Look for items in $(srcroot)/untracked too
    
    This way, we can build pangomm using NMake from Meson-generated source
    tarballs as well.

 MSVC_NMake/build-rules-msvc.mak | 8 ++++++++
 MSVC_NMake/config-msvc.mak      | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)
---
diff --git a/MSVC_NMake/build-rules-msvc.mak b/MSVC_NMake/build-rules-msvc.mak
index b298432..fef3e33 100644
--- a/MSVC_NMake/build-rules-msvc.mak
+++ b/MSVC_NMake/build-rules-msvc.mak
@@ -18,9 +18,17 @@
 $<
 <<
 
+{..\untracked\pango\pangomm\}.cc{$(CFG)\$(PLAT)\pangomm\}.obj::
+       $(CXX) $(LIBPANGOMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(CFG)\$(PLAT)\pangomm\ /c @<<
+$<
+<<
+
 {.\pangomm\}.rc{$(CFG)\$(PLAT)\pangomm\}.res:
        rc /fo$@ $<
 
+{..\untracked\MSVC_NMake\pangomm\}.rc{$(CFG)\$(PLAT)\pangomm\}.res:
+       rc /fo$@ $<
+
 # Rules for building .lib files
 $(PANGOMM_LIB): $(PANGOMM_DLL)
 
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index 080259f..d331f76 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -25,7 +25,8 @@ DEBUG_SUFFIX =
 !endif
 
 PANGOMM_BASE_CFLAGS =          \
-       /I..\pango /I.\pangomm  \
+       /I..\pango /I..\untracked\pango \
+       /I.\pangomm /I..\untracked\MSVC_NMake\pangomm   \
        /wd4530 /std:c++17      \
        /FImsvc_recommended_pragmas.h
 


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