ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

-I$(dir $(3)) in gb_CObject__command_pattern is no longer needed

Browse Source 
...in com_MSC_class.mk now, similar to ecbaf98062
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 <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2017-11-03 23:44:11 +01:00
parent 12f09377b9
commit f218f8f6c8
4 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/libstaroffice/Library_staroffice.mk
Vendored
+1
View File
@@ -19,6 +19,7 @@ $(eval $(call gb_Library_set_warnings_not_errors,staroffice))
$(eval $(call gb_Library_set_include,staroffice,\
-I$(call gb_UnpackedTarball_get_dir,libstaroffice)/inc \
-I$(call gb_UnpackedTarball_get_dir,libstaroffice)/src/lib \
$$(INCLUDE) \
))
external/redland/Library_raptor.mk
Vendored
+5
View File
@@ -9,6 +9,11 @@
$(eval $(call gb_Library_Library,raptor2))
$(eval $(call gb_Library_set_include,raptor2, \
-I$(call gb_UnpackedTarball_get_dir,raptor)/src \
$$(INCLUDE) \
))
$(eval $(call gb_Library_use_unpacked,raptor2,raptor))
$(eval $(call gb_Library_use_externals,raptor2,\
external/redland/Library_rdf.mk
Vendored
+5
View File
@@ -9,6 +9,11 @@
$(eval $(call gb_Library_Library,rdf))
$(eval $(call gb_Library_set_include,rdf, \
-I$(call gb_UnpackedTarball_get_dir,redland)/src \
$$(INCLUDE) \
))
$(eval $(call gb_Library_use_unpacked,rdf,redland))
$(eval $(call gb_Library_set_warnings_not_errors,rdf))
solenv/gbuild/platform/com_MSC_class.mk
-2
View File
@@ -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))