[Libreoffice-commits] core.git: solenv/gbuild

[Mike Kaganski]

 solenv/gbuild/platform/com_MSC_defs.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1f4a1b74369caa1a61026b7776abe13f24ed48c1
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Fri Nov 10 15:49:53 2017 +0300

    MSC: Embed Natvis to PDBs, to use in /DEBUGEXE debugs
    
    E.g., when a unit test is debugged using
    make CppunitTest_foo CPPUNITTRACE=TRUE
    then devenv.exe is launched with /DEBUGEXE switch, and it's impossible
    to add a .natvis file to the debug session (unless one adds the file
    to path where VS looks for visualizers). A natvis added to PDBs will be
    used in this case.
    
    See https://docs.microsoft.com/en-us/cpp/build/reference/natvis-add-natvis-to-pdb
    
    Change-Id: Icc31eb7c4fd063810e4074eaff774e8146b86877
    Reviewed-on: https://gerrit.libreoffice.org/44595
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index dd3e31952ed8..2925315da324 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -238,6 +238,7 @@ gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
 gb_LinkTarget_LDFLAGS := \
 	$(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-nologo,) \
 	$(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst \,/,$(ILIB))))) \
+	/NATVIS:$(SRCDIR)/solenv/vs/LibreOffice.natvis \
 
 # Prevent warning spamming
 # Happens because of the way we link our unit tests with our libraries.