diff options
| author | jan Iversen <jani@documentfoundation.org> | 2016-12-14 19:14:49 +0100 |
|---|---|---|
| committer | jan Iversen <jani@documentfoundation.org> | 2016-12-14 19:16:54 +0100 |
| commit | d50c9221a50160ae38aa72ad87a1ad70a16b6b4c (patch) | |
| tree | e0f5f5dbad75ec206195831be5d85f1b817927c6 /solenv | |
| parent | b2796c07111ddfd8b6e106b44f6ca18328294cd2 (diff) | |
update to gbuildtojson for osx
Added extra gb_ macros, which seems to be used only for osx
Removed second jurt in BLACKLIST (assuming it is not like "not not True")
Change-Id: I989eb2e6de6f0edde7902b51f829442bd598eec2
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/post_GbuildToJson.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk b/solenv/gbuild/extensions/post_GbuildToJson.mk index c608e33c6546..1fb07055ad2e 100644 --- a/solenv/gbuild/extensions/post_GbuildToJson.mk +++ b/solenv/gbuild/extensions/post_GbuildToJson.mk @@ -100,6 +100,10 @@ gb_Library_add_cxxobjects = $(call gb_Library_get_target,$(1)): CXXOBJECTS += $( gb_Library_add_exception_object = $(call gb_Library_get_target,$(1)): CXXOBJECTS += $(2) gb_Library_add_exception_objects = $(call gb_Library_get_target,$(1)): CXXOBJECTS += $(2) +# Objective C++ macros +gb_Library_add_objcxxobjects = $(call gb_Library_get_target,$(1)): CXXOBJECTS += $(2) +gb_Library_add_objcobjects = $(call gb_Library_get_target,$(1)): CXXOBJECTS += $(2) + #$(call gb_Library_get_exports_target,%): $(WORKDIR)/LinkTarget/Library/%.exports: @@ -135,7 +139,7 @@ endef gb_Module_add_l10n_target = -gb_GbuildToJson_BLACKLISTEDMODULES := connectivity compilerplugins cli_ure dictionaries bridges helpcompiler helpcontent2 icon-themes jurt sal shell cppu cppuhelper cpputools extensions external i18npool javaunohelper jurt lingucomponent odk scaddins solenv stoc tools translations udkapi unoidl +gb_GbuildToJson_BLACKLISTEDMODULES := connectivity compilerplugins cli_ure dictionaries bridges helpcompiler helpcontent2 icon-themes jurt sal shell cppu cppuhelper cpputools extensions external i18npool javaunohelper lingucomponent odk scaddins solenv stoc tools translations udkapi unoidl define gb_Module__add_moduledir_impl include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))/$(2)/Module_$(2).mk |