[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - Library_merged.mk

[Christian Lohmaier]

 Library_merged.mk |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e7748f4c05cef200eb9f9fa5aecb9806091de7a1
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Thu Jun 25 16:09:35 2015 +0200

    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 at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/Library_merged.mk b/Library_merged.mk
index fa2f24d..2e482e8 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)