mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to gbuildtojson for osx

Browse Source 
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
This commit is contained in:
jan Iversen 2016-12-14 19:14:49 +01:00
parent b2796c0711
commit d50c9221a5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
solenv/gbuild/extensions/post_GbuildToJson.mk
View File

@ -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