From f218f8f6c8c587d2d78679f935093329f145fede Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 3 Nov 2017 16:41:53 +0100 Subject: -I$(dir $(3)) in gb_CObject__command_pattern is no longer needed ...in com_MSC_class.mk now, similar to ecbaf980625a9e7b06abe91c7c70e78f6ad469a7 for com_GCC_class.mk. Three libraries built from external sources (for Windows only) needed adjustment. Change-Id: Id8976a30b80efff6119afb18ccaf6811fe27d2f8 Reviewed-on: https://gerrit.libreoffice.org/44270 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- solenv/gbuild/platform/com_MSC_class.mk | 2 -- 1 file changed, 2 deletions(-) (limited to 'solenv/gbuild') diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 3bc5e3235420..b00741184d27 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -55,7 +55,6 @@ $(call gb_Helper_abbreviate_dirs,\ -Fd$(PDBFILE) \ $(PCHFLAGS) \ $(if $(COMPILER_TEST),,$(gb_COMPILERDEPFLAGS)) \ - -I$(dir $(3)) \ $(INCLUDE) \ $(if $(filter YES,$(CXXOBJECT_X64)), -U_X86_ -D_AMD64_,) \ -c $(3) \ @@ -83,7 +82,6 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(EXTERNAL_CODE),$(if $(COM_IS_CLANG),-Wno-undef),$(gb_DEFS_INTERNAL)) \ $(gb_LTOFLAGS) \ $(gb_COMPILERDEPFLAGS) \ - -I$(dir $(3)) \ $(6) \ -c $(3) \ -Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj) $(call gb_create_deps,$(call gb_PrecompiledHeader_get_dep_target_tmp,$(2)),$(1),$(3)) -- cgit