diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2015-01-08 21:14:04 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2015-01-09 07:17:35 +0100 |
| commit | 5c5edaef89e953d260501678c3d62c47ad9763ac (patch) | |
| tree | 64a4c03d76aeffdeebc5680484bd71999d7bdf2d /svx | |
| parent | 3f34668673e012860b971e24a7633c300df0c4d1 (diff) | |
Revert "Use SVLIBRARY instead of gb_Library_get_runtime_filename"
$(call gb_Library__get_name,foo) returns "libmerged" if library foo is merged.
This reverts commit ee567a63fad9e755b11ca28696da35f00ed3b0fc.
Change-Id: I6ab9b7f0b01262a6f9d5a6834a6cffdd6ffc6f8a
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/Library_svxcore.mk | 1 | ||||
| -rw-r--r-- | svx/source/form/dbtoolsclient.cxx | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index a1c769686823..39d6be5686c6 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,\ diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx index baee83829c0c..79e6eab0a4d6 100644 --- a/svx/source/form/dbtoolsclient.cxx +++ b/svx/source/form/dbtoolsclient.cxx @@ -116,7 +116,7 @@ namespace svxform // load the dbtools library s_hDbtoolsModule = osl_loadModuleRelative( - &thisModule, OUString(SVLIBRARY("dbtools")).pData, 0); + &thisModule, OUString(DBTOOLS_DLL_NAME).pData, 0); OSL_ENSURE(NULL != s_hDbtoolsModule, "ODbtoolsClient::registerClient: could not load the dbtools library!"); if (NULL != s_hDbtoolsModule) { |