solenv/gbuild/platform/com_MSC_class.mk | 1 + solenv/gbuild/platform/com_MSC_defs.mk | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)
New commits: commit 3be1d4858db23c44de63f788a633be3a9bcf92a7 Author: Mike Kaganski <mike.kagan...@collabora.com> Date: Tue Apr 3 13:41:17 2018 +0100 Don't use /NATVIS for static libraries This avoids linker warnings: LINK : warning LNK4044: unrecognized option '/NATVIS:path/to/solenv/vs/LibreOffice.natvis'; ignored Change-Id: I9cb0dee7a4f1b07e975371f122aa9c7dbba783e1 Reviewed-on: https://gerrit.libreoffice.org/52309 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com> diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 8c0a23e9bf03..1dfa3b899ebf 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -178,6 +178,7 @@ $(call gb_Helper_abbreviate_dirs,\ -LIBPATH:$(UCRTSDKDIR)lib/$(UCRTVERSION)/ucrt/x64 \ $(if $(filter 80 81 10,$(WINDOWS_SDK_VERSION)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/$(WINDOWS_SDK_LIB_SUBDIR)/um/x64)) \ $(T_LDFLAGS) \ + $(if $(filter Library CppunitTest Executable,$(TARGETTYPE)),/NATVIS:$(SRCDIR)/solenv/vs/LibreOffice.natvis) \ @$${RESPONSEFILE} \ $(foreach lib,$(sort $(LINKED_LIBS)),$(call gb_Library_get_ilibfilename,$(lib))) \ $(foreach lib,$(sort $(LINKED_STATIC_LIBS)),$(call gb_StaticLibrary_get_filename,$(lib))) \ diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index b276f2d5329e..67fa66d511dc 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -241,7 +241,6 @@ 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. _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits