summaryrefslogtreecommitdiff
path: root/Library_merged.mk
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-06-25 16:09:35 +0200
committerAndras Timar <andras.timar@collabora.com>2015-08-06 12:51:56 +0200
commitaeef8d5fc7361b70b074b83b2aad9a571b09bf16 (patch)
treede3a1d5b33ba2bc4b812bcecd457221648f04fb2 /Library_merged.mk
parent55d5c192ed0235365c2ee9010d05060dfffb71bc (diff)
tdf#91485 fix cursors not displayed on Windows with mergedlibs
Change-Id: I502d3d2490be5307364dee59c7ee36c0fb7ef55f (cherry picked from commit df7595a5f5871f8343e4ee3869ad153e3ae4a7f3) Reviewed-on: https://gerrit.libreoffice.org/16472 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'Library_merged.mk')
-rw-r--r--Library_merged.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/Library_merged.mk b/Library_merged.mk
index fa2f24d179ba..2e482e8d91e5 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -36,6 +36,8 @@ $(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)