[Libreoffice-commits] .: 2 commits - RepositoryExternal.mk shell/StaticLibrary_xmlparser_x64.mk

[David Tardon]

 RepositoryExternal.mk                |    8 +++++++-
 shell/StaticLibrary_xmlparser_x64.mk |    8 ++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit c1c295a6e8903025ee77c54b94af4566e0e0af8c
Author: David Tardon <dtardon at redhat.com>
Date:   Wed May 30 12:08:56 2012 +0200

    define XML_UNICODE for x64 lib too
    
    Change-Id: Idac89f9165058bfa40189ff4c4e8cd4b5bc78b79

diff --git a/shell/StaticLibrary_xmlparser_x64.mk b/shell/StaticLibrary_xmlparser_x64.mk
index 1944380..845c31e 100644
--- a/shell/StaticLibrary_xmlparser_x64.mk
+++ b/shell/StaticLibrary_xmlparser_x64.mk
@@ -34,6 +34,14 @@ $(eval $(call gb_StaticLibrary_set_include,shell_xmlparser_x64,\
 	$$(INCLUDE) \
 ))
 
+$(eval $(call gb_StaticLibrary_add_defs,shell_xmlparser_x64,\
+	-DXML_UNICODE \
+))
+
+$(eval $(call gb_StaticLibrary_use_externals,shell_xmlparser_x64,\
+	expat_utf16 \
+))
+
 $(eval $(call gb_StaticLibrary_add_x64_generated_exception_objects,shell_xmlparser_x64,\
     CustomTarget/shell/source/all/xml_parser \
 ))
commit 8af6aa628b863b7565d397042fccefb8d78835fa
Author: David Tardon <dtardon at redhat.com>
Date:   Wed May 30 12:06:42 2012 +0200

    really fix ldap lib. name
    
    Change-Id: If003a4283fb4d0f3edd127e77de6b812501fa65a

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 84e368a..67869be 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1290,8 +1290,14 @@ $(call gb_LinkTarget_use_external,$(1),openssl)
 $(call gb_LinkTarget_use_libraries,$(1),\
 	secur32 \
 	ws2_32 \
-	$(if $(filter YES,$(WITH_LDAP)),ldap50) \
 )
+
+ifeq ($(WITH_LDAP),YES)
+$(call gb_LinkTarget_add_libs,$(1),\
+	nsldap32v50.lib \
+)
+endif
+
 endif
 
 endef