Author: jim
Date: Thu Feb 21 16:34:19 2019
New Revision: 1854065
URL: http://svn.apache.org/viewvc?rev=1854065&view=rev
Log:
Get ObjC files to build and link
Modified:
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/solenv/gbuild/TargetLocations.mk
openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
Modified: openoffice/trunk/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1854065&r1=1854064&r2=1854065&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Thu Feb 21 16:34:19 2019
@@ -80,6 +80,7 @@ $(eval $(call gb_Helper_register_librari
agg \
analysis \
animcore \
+ apple_remote \
avmedia \
avmediagst \
avmediaMacAVF \
Modified: openoffice/trunk/main/solenv/gbuild/TargetLocations.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/TargetLocations.mk?rev=1854065&r1=1854064&r2=1854065&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/TargetLocations.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/TargetLocations.mk Thu Feb 21 16:34:19
2019
@@ -83,6 +83,7 @@ gb_Module_get_subsequentcheck_target = $
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_clea
$(eval $(call gb_Helper_make_dep_targets,\
CObject \
CxxObject \
+ ObjCObject \
ObjCxxObject \
GenCObject \
GenCxxObject \
Modified: openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/macosx.mk?rev=1854065&r1=1854064&r2=1854065&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/macosx.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/macosx.mk Thu Feb 21 16:34:19
2019
@@ -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) \
