diff options
Diffstat (limited to 'solenv/gbuild/platform/ios.mk')
| -rw-r--r-- | solenv/gbuild/platform/ios.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk index 7621ff051f0b..7c2e7076422d 100644 --- a/solenv/gbuild/platform/ios.mk +++ b/solenv/gbuild/platform/ios.mk @@ -158,7 +158,7 @@ $(call gb_Helper_abbreviate_dirs,\ -c $(3) \ -o $(1) \ -MMD -MT $(1) \ - -MF $(4) \ + -MP -MF $(4) \ -I$(dir $(3)) \ $(INCLUDE)) endef @@ -177,7 +177,7 @@ $(call gb_Helper_abbreviate_dirs,\ -c $(3) \ -o $(1) \ -MMD -MT $(1) \ - -MF $(4) \ + -MP -MF $(4) \ -I$(dir $(3)) \ $(INCLUDE_STL) $(INCLUDE)) endef @@ -195,7 +195,7 @@ $(call gb_Helper_abbreviate_dirs,\ -c $(3) \ -o $(1) \ -MMD -MT $(1) \ - -MF $(4) \ + -MP -MF $(4) \ -I$(dir $(3)) \ $(INCLUDE_STL) $(INCLUDE)) endef @@ -212,7 +212,7 @@ $(call gb_Helper_abbreviate_dirs,\ -c $(3) \ -o $(1) \ -MMD -MT $(call gb_ObjCObject_get_target,$(2)) \ - -MF $(call gb_ObjCObject_get_dep_target,$(2)) \ + -MP -MF $(call gb_ObjCObject_get_dep_target,$(2)) \ -I$(dir $(3)) \ $(INCLUDE_STL) $(INCLUDE)) endef @@ -237,7 +237,8 @@ gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC))) # FIXME framework handling very hackish define gb_LinkTarget__get_liblinkflags -$(patsubst lib%.a,-l%,$(foreach lib,$(filter-out $(gb_Library__FRAMEWORKS),$(1)),$(call gb_Library_get_filename,$(lib)))) \ +$(patsubst lib%.a,-l%,$(foreach lib,$(filter-out $(gb_Library__FRAMEWORKS) $(gb_Library_UNOLIBS_OOO),$(1)),$(call gb_Library_get_filename,$(lib)))) \ +$(foreach lib,$(filter $(gb_Library_UNOLIBS_OOO),$(1)),$(SOLARVER)/$(INPATH)/lib/$(lib)$(gb_Library_UNOEXT)) \ $(addprefix -framework ,$(filter $(gb_Library__FRAMEWORKS),$(1))) endef |