diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-06-04 16:11:19 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-06-09 17:05:50 +0200 |
| commit | 1817366cb5f61337b34b5284615d3d4e0a8aa68a (patch) | |
| tree | 03ac5b051b6367567c66c6aa6741d63ef9ff7ef1 /toolkit | |
| parent | 2aab2f4b7b0736e19b76abad652bbb055b18b857 (diff) | |
gbuild: remove config_libraries.h and gb_Helper_generate_config_libraries
This much ugly complexity, generating a header on every gbuild startup
etc. is really not warranted for 6 callers of the generated macros.
Also, the Win32 make has problems with the quoting.
Change-Id: If945e09c1730e52174a6084677842dc611d66b2f
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/Library_tk.mk | 1 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index a8fbeb50eb87..ddce52ed47d5 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Library_set_include,tk,\ $(eval $(call gb_Library_add_defs,tk,\ -DTOOLKIT_DLLIMPLEMENTATION \ + -DSVT_DLL_NAME=\"$(call gb_Library_get_runtime_filename,svt)\" \ )) $(eval $(call gb_Library_use_sdk_api,tk)) diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 054ef9432b48..4b6635621ccf 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <config_libraries.h> - #include <boost/ptr_container/ptr_vector.hpp> #include <stdio.h> @@ -1223,7 +1221,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( ) { #ifndef DISABLE_DYNLOADING - OUString aLibName(LIBO_LIBRARY(svt)); + OUString aLibName(SVT_DLL_NAME); hSvToolsLib = osl_loadModuleRelative( &thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT ); if ( hSvToolsLib ) |