6d1c8a4358
...and thus exporting osl::Guard<comphelper::SolarMutex> members from vcl. With
--disable-pch that caused linking Library_acc to fail with duplicate symbols, as
accessibility/source/standard/vclxaccessiblebutton.cxx uses
comphelper::OExternalLockGuard (include/comphelper/accessiblecontexthelper.hxx),
which also derives from osl::Guard<comphelper::SolarMutex> (and is also all-
inline, and not marked as DLLPUBLIC), so also emits such members. With
--enable-pch, vclxaccessiblebutton.cxx happens to see SolarMutexGuard from
include/vcl/svapp.hxx before comphelper::OExternalLockGuard, and thus doesn't
emit any such members.
As SolarMutexGuard is all-inline, there should not be much point in making it
VCL_DLLPUBLIC in the first place (was there ever since the class's introduction
in b450a32890 "create a class SolarMutexGuard to
take a Guard on the SolarMutex"), so just drop that.
Change-Id: Ie9d493370c7d34981bb35e5d9e100cf987eb83ca
Reviewed-on: https://gerrit.libreoffice.org/42616
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
84 lines
2.2 KiB
Makefile
84 lines
2.2 KiB
Makefile
# -*- 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_Library_Library,UAccCOM))
|
|
|
|
$(eval $(call gb_Library_use_custom_headers,UAccCOM,winaccessibility/ia2/idl))
|
|
|
|
$(eval $(call gb_Library_set_include,UAccCOM,\
|
|
$$(INCLUDE) \
|
|
-I$(SRCDIR)/winaccessibility/inc \
|
|
$(foreach i,$(ATL_INCLUDE), -I$(i)) \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_defs,UAccCOM,\
|
|
-DUACCCOM_DLLIMPLEMENTATION \
|
|
-D_UNICODE \
|
|
-DUNICODE \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_sdk_api,UAccCOM))
|
|
|
|
$(eval $(call gb_Library_add_nativeres,UAccCOM,UAccCOM))
|
|
|
|
$(eval $(call gb_Library_add_exception_objects,UAccCOM,\
|
|
winaccessibility/source/UAccCOM/AccAction \
|
|
winaccessibility/source/UAccCOM/AccActionBase \
|
|
winaccessibility/source/UAccCOM/AccComponent \
|
|
winaccessibility/source/UAccCOM/AccComponentBase \
|
|
winaccessibility/source/UAccCOM/AccEditableText \
|
|
winaccessibility/source/UAccCOM/AccHyperLink \
|
|
winaccessibility/source/UAccCOM/AccHypertext \
|
|
winaccessibility/source/UAccCOM/AccImage \
|
|
winaccessibility/source/UAccCOM/AccRelation \
|
|
winaccessibility/source/UAccCOM/AccTable \
|
|
winaccessibility/source/UAccCOM/AccText \
|
|
winaccessibility/source/UAccCOM/AccTextBase \
|
|
winaccessibility/source/UAccCOM/AccValue \
|
|
winaccessibility/source/UAccCOM/EnumVariant \
|
|
winaccessibility/source/UAccCOM/MAccessible \
|
|
winaccessibility/source/UAccCOM/StdAfx \
|
|
winaccessibility/source/UAccCOM/UAccCOM \
|
|
winaccessibility/source/UAccCOM/UNOXWrapper \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_ldflags,UAccCOM,\
|
|
/DEF:$(SRCDIR)/winaccessibility/source/UAccCOM/UAccCOM.def \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_libraries,UAccCOM,\
|
|
vcl \
|
|
comphelper \
|
|
cppu \
|
|
sal \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_externals,UAccCOM,\
|
|
boost_headers \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_system_win32_libs,UAccCOM,\
|
|
oleacc \
|
|
advapi32 \
|
|
delayimp \
|
|
kernel32 \
|
|
ole32 \
|
|
oleaut32 \
|
|
shlwapi \
|
|
user32 \
|
|
uuid \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_libs,UAccCOM,\
|
|
$(ATL_LIB)/atls.lib \
|
|
))
|
|
|
|
# vim:set noet sw=4 ts=4:
|