Repository.mk | 1 +
solenv/gbuild/TargetLocations.mk | 2 ++
solenv/gbuild/platform/macosx.mk | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit dd9b9e930a7d58bc4a472fb683edbf938772f110
Author: Jim Jagielski <j...@apache.org>
AuthorDate: Thu Feb 21 16:34:19 2019 +0000
Commit: Jim Jagielski <j...@apache.org>
CommitDate: Thu Feb 21 16:34:19 2019 +0000
Get ObjC files to build and link
diff --git a/Repository.mk b/Repository.mk
index 3a33d0f9f112..f379061a6b43 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -80,6 +80,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
agg \
analysis \
animcore \
+ apple_remote \
avmedia \
avmediagst \
avmediaMacAVF \
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 8e9fef96e70e..34ef104229d9 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -83,6 +83,7 @@ gb_Module_get_subsequentcheck_target =
$(WORKDIR)/Module/subsequentcheck/$(1)
gb_Module_get_target = $(WORKDIR)/Module/$(1)
gb_NoexPrecompiledHeader_get_dep_target =
$(WORKDIR)/Dep/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/$(1).hxx.pch.d
gb_NoexPrecompiledHeader_get_target =
$(WORKDIR)/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/$(1).hxx.pch
+gb_ObjCObject_get_target = $(WORKDIR)/ObjCObject/$(1).o
gb_ObjCxxObject_get_target = $(WORKDIR)/ObjCxxObject/$(1).o
gb_Package_get_preparation_target = $(WORKDIR)/Package/prepared/$(1)
gb_Package_get_target = $(WORKDIR)/Package/$(1)
@@ -147,6 +148,7 @@ $(eval $(call gb_Helper_make_outdir_clean_targets,\
$(eval $(call gb_Helper_make_dep_targets,\
CObject \
CxxObject \
+ ObjCObject \
ObjCxxObject \
GenCObject \
GenCxxObject \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index d859e3a78f58..7ea8c7a7f1b6 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -235,7 +235,7 @@ endef
# ObjCObject class
define gb_ObjCObject__command
-$(call gb_Output_announce,$(2),$(true),OC ,3)
+$(call gb_Output_announce,$(2),$(true),OC,3)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) $(dir $(4)) && \
$(gb_CC) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
