[Libreoffice-commits] .: oox/Library_oox.mk

Tor Lillqvist tml at kemper.freedesktop.org
Fri Apr 29 05:36:49 PDT 2011


 oox/Library_oox.mk |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit b7c946a65a9163fbd56832d1739c71f58daf1235
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Apr 29 15:14:07 2011 +0300

    Fix crypto stuff when building on Windows

diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 84316db..6fcbf00 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -71,11 +71,18 @@ $(eval $(call gb_Library_add_linked_libs,oox,\
     ssl \
 ))
 else
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_static_libs,oox,\
+    libeay32 \
+    ssleay32 \
+))
+else
 $(eval $(call gb_Library_add_linked_static_libs,oox,\
     crypto \
     ssl \
 ))
 endif
+endif
 
 $(eval $(call gb_Library_set_ldflags,oox,\
 	$$(LDFLAGS) \


More information about the Libreoffice-commits mailing list