summaryrefslogtreecommitdiff
path: root/Library_merged.mk
blob: 843dcb0582454a68980868b160d11c00189c4000 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
# -*- 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,merged))

# gb_MERGEDLIBS is defined in solenv/gbuild/extensions/pre_MergedLibsList.mk
$(eval $(call gb_Library_use_library_objects,merged,\
	$(gb_MERGEDLIBS) \
))

$(eval $(call gb_Library_use_libraries,merged,\
	cppu \
	cppuhelper \
	i18nlangtag \
	$(if $(ENABLE_JAVA), \
		jvmaccess \
		jvmfwk) \
	sal \
	salhelper \
	xmlreader \
))

ifeq ($(OS),WNT)
# prevent warning spamming
$(eval $(call gb_Library_add_ldflags,merged,\
	/ignore:4049 \
	/ignore:4217 \
))
# cursors
$(eval $(call gb_Library_add_nativeres,merged,vcl/salsrc))
endif

ifeq ($(OS),MACOSX)
$(eval $(call gb_Library_use_libraries,merged,\
	AppleRemote \
))
endif

# vim: set noet sw=4 ts=4:
-04-09vcl: window destructors calling disposeNoel Grandin Extend plugin to warn on any vcl::Window subclass that has a destructor and does not implement dispose. Apply this provision to the necessary classes in vcl/ Change-Id: I05189f8df02568131d59fc44fea904c87733c8c7 2014-09-23fdo#82577: Handle WindowNoel Grandin Put the VCL Window class in the vcl namespace. Avoids clash with the X11 Window typedef. Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a 2014-04-02Kill superfluous vertical whitespaceTor Lillqvist Change-Id: I81ce8fd7022bf283db668705efdfb0666f87bde9 2014-02-26Remove visual noise from vclAlexander Wilms Conflicts: vcl/source/app/settings.cxx vcl/source/window/dockmgr.cxx vcl/source/window/dockwin.cxx vcl/source/window/floatwin.cxx vcl/source/window/toolbox2.cxx Change-Id: Ie67681549a76e77064b09d4b5bf80fe4c6010341 Reviewed-on: https://gerrit.libreoffice.org/8339 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> 2013-02-15Resolves: rhbz#895196 sc filter float a11y parent of itself loop/recurseCaolán McNamara Change-Id: I3679e7cfcd32a78b40c6a7b803c92ff0abe6f32c 2012-06-21re-base on ALv2 code.Michael Meeks Change-Id: I6c145e984c885c7e06caa1c27bfb354ea49ad9ce 2011-11-27remove include of pch header from vclNorbert Thiebaud 2010-10-14Add vim/emacs modelines to all source filesSebastian Spaeth Fixes #fdo30794 Based on bin/add-modelines script (originally posted in mail 1286706307.1871.1399280959@webmail.messagingengine.com) Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de> 2010-02-12changefileheader2: #i109125#: change source file copyright notice from Sun ↵Jens-Heiner Rechtien Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2009-08-27Added a new child class of FloatingWindow to separate popup menu specific ↵Kohei Yoshida stuff to it. Let's leave the existing FloatingWindow alone.