summaryrefslogtreecommitdiff
path: root/svx/Library_svxcore.mk
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2014-10-01 11:57:30 +0200
committerDavid Tardon <dtardon@redhat.com>2014-10-02 08:23:53 +0000
commit08f33ca66559dfafd29ab0c6073232cf05a6d4e5 (patch)
tree05fa8d03e855bc9b1fe6bba8b165dabfc62876fc /svx/Library_svxcore.mk
parent258f4ba9de5e40210f8a38817f89cf93ac25ebed (diff)
fdo#84315 quick fix
In mergedlib case, load ourselves (that is, mergedlib). Fixes bug symptoms, while waiting for fully clean solution, which is killing svx/dbtoolsclient completely. Change-Id: Ib8ad34ee4697f89bdc6bbe64d406053f9e7f7521 Reviewed-on: https://gerrit.libreoffice.org/11738 Reviewed-by: Matúš Kukan <matus.kukan@collabora.com> Tested-by: Matúš Kukan <matus.kukan@collabora.com> Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'svx/Library_svxcore.mk')
-rw-r--r--svx/Library_svxcore.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 24b5788512ef..7efaf278d413 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_set_precompiled_header,svxcore,$(SRCDIR)/svx/inc/pch/pr
$(eval $(call gb_Library_add_defs,svxcore,\
-DSVX_DLLIMPLEMENTATION \
-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
+ -DDBTOOLS_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,dbtools))\" \
))
$(eval $(call gb_Library_use_libraries,svxcore,\