desktop/Library_sofficeapp.mk | 3 ---
vcl/Library_vcl.mk | 17 +++++++++--------
vcl/Library_vclplug_svp.mk | 10 ----------
vcl/Module_vcl.mk | 1 -
vcl/StaticLibrary_headless.mk | 37 -------------------------------------
vcl/inc/headless/svpbmp.hxx | 2 +-
vcl/inc/headless/svpdummies.hxx | 6 +++---
vcl/inc/headless/svpframe.hxx | 2 +-
vcl/inc/headless/svpgdi.hxx | 2 +-
vcl/inc/headless/svpinst.hxx | 6 +++---
vcl/inc/headless/svpvd.hxx | 2 +-
11 files changed, 19 insertions(+), 69 deletions(-)
New commits:
commit 6efb7f65eea764ffe5b71f65f9b7eea125183ec3
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Mar 2 14:59:24 2015 +0000
if you link vclplug_svp to desktop you end up with duplicate font caches
so how about we just move all of the svp "headless" stuff into vcl
proper
Change-Id: Ibf4ab0b0698ef031ffeeb05ef9bbcf3b89144010
Reviewed-on: https://gerrit.libreoffice.org/14714
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index f674d6b..241be85 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -59,9 +59,6 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\
ucbhelper \
utl \
vcl \
- $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
- $(if $(ENABLE_HEADLESS),,vclplug_svp) \
- ) \
$(gb_UWINAPI) \
))
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 6aeb70b..f96141e 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -573,7 +573,14 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
, \
vcl/null/printerinfomanager \
) \
+ $(vcl_headless_code) \
+ $(vcl_headless_freetype_code) \
))
+
+$(eval $(call gb_Library_use_libraries,vcl,\
+ basebmp \
+))
+
$(eval $(call gb_Library_use_externals,vcl,\
cups \
dbus \
@@ -590,12 +597,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/unx/generic/printer/ppdparser \
vcl/null/printerinfomanager \
vcl/headless/headlessinst \
- $(vcl_headless_code) \
- $(vcl_headless_freetype_code) \
-))
-
-$(eval $(call gb_Library_use_libraries,vcl,\
- basebmp \
))
$(eval $(call gb_Library_use_externals,vcl,\
@@ -616,8 +617,8 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/unx/generic/printer/ppdparser \
vcl/null/printerinfomanager \
vcl/android/androidinst \
- $(vcl_headless_code) \
- $(vcl_headless_freetype_code) \
+ $(vcl_headless_code) \
+ $(vcl_headless_freetype_code) \
))
$(eval $(call gb_Library_use_static_libraries,vcl,\
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
index 08f5c08..3084ec8 100644
--- a/vcl/Library_vclplug_svp.mk
+++ b/vcl/Library_vclplug_svp.mk
@@ -54,16 +54,6 @@ $(eval $(call gb_Library_use_externals,vclplug_svp,\
icuuc \
))
-$(eval $(call gb_Library_add_exception_objects,vclplug_svp,\
- vcl/headless/svpgdi \
- vcl/headless/svpinst \
- vcl/headless/svpdata \
-))
-
-$(eval $(call gb_Library_use_static_libraries,vclplug_svp,\
- headless \
-))
-
ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_libs,vclplug_svp,\
-lm \
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index a0ed040..3be0ae4 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_Module_add_targets,vcl,\
Library_vclplug_svp \
Library_vclplug_gen \
Library_desktop_detector \
- StaticLibrary_headless \
StaticLibrary_glxtest \
Package_fontunxppds \
Package_fontunxpsprint \
diff --git a/vcl/StaticLibrary_headless.mk b/vcl/StaticLibrary_headless.mk
deleted file mode 100644
index 941f4ed..0000000
--- a/vcl/StaticLibrary_headless.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_StaticLibrary_StaticLibrary,headless))
-
-$(eval $(call gb_StaticLibrary_use_externals,headless,\
- boost_headers \
- freetype_headers \
-))
-
-$(eval $(call gb_StaticLibrary_use_api,headless,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_StaticLibrary_add_exception_objects,headless,\
- vcl/headless/svpbmp \
- vcl/headless/svpdummies \
- vcl/headless/svpframe \
- vcl/headless/svpprn \
- vcl/headless/svptext \
- vcl/headless/svptextrender \
- vcl/headless/svpvd \
-))
-
-$(eval $(call gb_StaticLibrary_set_include,headless,\
- $$(INCLUDE) \
- -I$(SRCDIR)/vcl/inc \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx
index 4b65acc..6a80c7c 100644
--- a/vcl/inc/headless/svpbmp.hxx
+++ b/vcl/inc/headless/svpbmp.hxx
@@ -29,7 +29,7 @@
#define SVP_DEFAULT_BITMAP_FORMAT basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX
-class SvpSalBitmap : public SalBitmap
+class VCL_DLLPUBLIC SvpSalBitmap : public SalBitmap
{
basebmp::BitmapDeviceSharedPtr m_aBitmap;
public:
diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx
index 2fe0176..bbe23e4 100644
--- a/vcl/inc/headless/svpdummies.hxx
+++ b/vcl/inc/headless/svpdummies.hxx
@@ -28,7 +28,7 @@
class SalGraphics;
-class SvpSalObject : public SalObject
+class VCL_DLLPUBLIC SvpSalObject : public SalObject
{
public:
SystemEnvData m_aSystemChildData;
@@ -49,7 +49,7 @@ public:
virtual const SystemEnvData* GetSystemData() const SAL_OVERRIDE;
};
-class SvpImeStatus : public SalI18NImeStatus
+class VCL_DLLPUBLIC SvpImeStatus : public SalI18NImeStatus
{
public:
SvpImeStatus() {}
@@ -59,7 +59,7 @@ class SvpImeStatus : public SalI18NImeStatus
virtual void toggle() SAL_OVERRIDE;
};
-class SvpSalSystem : public SalGenericSystem
+class VCL_DLLPUBLIC SvpSalSystem : public SalGenericSystem
{
public:
SvpSalSystem() {}
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index b3819e2..416a257 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -36,7 +36,7 @@
class SvpSalInstance;
class SvpSalGraphics;
-class SvpSalFrame : public SalFrame
+class VCL_DLLPUBLIC SvpSalFrame : public SalFrame
{
SvpSalInstance* m_pInstance;
SvpSalFrame* m_pParent; // pointer to parent
frame
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index b811a55..0c2f581 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -35,7 +35,7 @@
class ServerFont;
-class SvpSalGraphics : public SalGraphics
+class VCL_DLLPUBLIC SvpSalGraphics : public SalGraphics
{
basebmp::BitmapDeviceSharedPtr m_aDevice;
basebmp::BitmapDeviceSharedPtr m_aOrigDevice;
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index 7adaa7a..63fa483 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -57,7 +57,7 @@ public:
class SvpSalFrame;
class GenPspGraphics;
-class SvpSalInstance : public SalGenericInstance
+class VCL_DLLPUBLIC SvpSalInstance : public SalGenericInstance
{
timeval m_aTimeout;
sal_uLong m_nTimeoutMS;
@@ -171,9 +171,9 @@ public:
// -- as the rest of vcl always uses bit depths, it is perhaps simplest
// to let us simply change the mapping of bitcount to format (which was
// previously unchangeable).
- SAL_DLLPUBLIC_EXPORT void setBitCountFormatMapping( sal_uInt16 nBitCount,
::basebmp::Format aFormat );
+ void setBitCountFormatMapping( sal_uInt16 nBitCount, ::basebmp::Format
aFormat );
- SAL_DLLPUBLIC_EXPORT ::basebmp::Format getFormatForBitCount( sal_uInt16 );
+ ::basebmp::Format getFormatForBitCount( sal_uInt16 );
};
#endif // INCLUDED_VCL_INC_HEADLESS_SVPINST_HXX
diff --git a/vcl/inc/headless/svpvd.hxx b/vcl/inc/headless/svpvd.hxx
index fa9d042..255de3a 100644
--- a/vcl/inc/headless/svpvd.hxx
+++ b/vcl/inc/headless/svpvd.hxx
@@ -26,7 +26,7 @@
class SvpSalGraphics;
-class SvpSalVirtualDevice : public SalVirtualDevice
+class VCL_DLLPUBLIC SvpSalVirtualDevice : public SalVirtualDevice
{
sal_uInt16 m_nBitCount;
basebmp::BitmapDeviceSharedPtr m_aDevice;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
