From 1817366cb5f61337b34b5284615d3d4e0a8aa68a Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Wed, 4 Jun 2014 16:11:19 +0200
Subject: 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
---
 sd/Library_sd.mk               | 1 +
 sd/inc/pch/precompiled_sd.hxx  | 1 -
 sd/source/ui/dlg/sdabstdlg.cxx | 3 +--
 3 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'sd')

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 7ce290582147..d1bb6eb3ffdc 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_Library_set_include,sd,\
 
 $(eval $(call gb_Library_add_defs,sd,\
 	-DSD_DLLIMPLEMENTATION \
+	-DSDUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,sdui)\" \
 ))
 
 ifneq ($(strip $(dbg_anim_log)$(DBG_ANIM_LOG)),)
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 221208504b71..8937ebb081ad 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -369,7 +369,6 @@
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/string.hxx>
 #include <config_features.h>
-#include <config_libraries.h>
 #include <config_options.h>
 #include <cppcanvas/basegfxfactory.hxx>
 #include <cppcanvas/vclfactory.hxx>
diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx
index fc83a93248b5..fb75b373ca0d 100644
--- a/sd/source/ui/dlg/sdabstdlg.cxx
+++ b/sd/source/ui/dlg/sdabstdlg.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <config_features.h>
-#include <config_libraries.h>
 
 #include "sdabstdlg.hxx"
 
@@ -43,7 +42,7 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create()
 #if HAVE_FEATURE_DESKTOP
 #ifndef DISABLE_DYNLOADING
     static ::osl::Module aDialogLibrary;
-    static const OUString sLibName(LIBO_LIBRARY(sdui));
+    static const OUString sLibName(SDUI_DLL_NAME);
     if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName ) )
         fp = ( SdAbstractDialogFactory* (SAL_CALL*)() )
             aDialogLibrary.getFunctionSymbol( "SdCreateDialogFactory" );
-- 
cgit