diff options
| author | Damjan Jovanovic <damjan@apache.org> | 2016-08-07 19:24:03 +0000 |
|---|---|---|
| committer | Damjan Jovanovic <damjan@apache.org> | 2016-08-07 19:24:03 +0000 |
| commit | ca68acda60fa352d2a272a2a10d15a4cc209a681 (patch) | |
| tree | 76d808631e0a71ea683c8d7852f9d60f9e49dd06 /svx/Library_svx.mk | |
| parent | 5b6c4bddf6134f377a61446d8bcf1be2f096aad1 (diff) | |
Merge branches/gbuild-reintegration to trunk.
Notes
Notes:
ignore: obsolete
Diffstat (limited to 'svx/Library_svx.mk')
| -rw-r--r-- | svx/Library_svx.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 2fcb2e8c04d2..db74fd4294a0 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -30,11 +30,14 @@ $(eval $(call gb_Library_set_include,svx,\ -I$(SRCDIR)/svx/source/inc \ -I$(SRCDIR)/svx/inc/pch \ $$(SOLARINC) \ - -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,svx,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_api,svx,\ + udkapi \ + offapi \ +)) + +$(eval $(call gb_Library_add_defs,svx,\ -DSVX_DLLIMPLEMENTATION \ -DBOOST_SPIRIT_USE_OLD_NAMESPACE \ )) @@ -50,7 +53,6 @@ $(eval $(call gb_Library_add_linked_libs,svx,\ fwe \ fwk \ i18nisolang1 \ - icuuc \ sal \ sfx \ sot \ @@ -69,6 +71,8 @@ $(eval $(call gb_Library_add_linked_libs,svx,\ $(gb_STDLIBS) \ )) +$(call gb_Library_use_external,svx,icuuc) + $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/accessibility/AccessibleControlShape \ svx/source/accessibility/AccessibleEmptyEditSource \ |