Kaydet (Commit) 22f60a3e authored tarafından Miklos Vajna's avatar Miklos Vajna

libxmlsec windows: no longer build the mscrypto backend

Only the mscng one is used.

Change-Id: Ic8716cd465b2631da56f47d36811731be205fc3e
Reviewed-on: https://gerrit.libreoffice.org/58446
Tested-by: Jenkins
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst e3c0b6e6
...@@ -12,7 +12,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,xmlsec,xmlsec)) ...@@ -12,7 +12,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,xmlsec,xmlsec))
$(eval $(call gb_ExternalPackage_use_external_project,xmlsec,xmlsec)) $(eval $(call gb_ExternalPackage_use_external_project,xmlsec,xmlsec))
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
$(eval $(call gb_ExternalPackage_add_file,xmlsec,$(LIBO_LIB_FOLDER)/libxmlsec-mscrypto.dll,win32/binaries/libxmlsec-mscrypto.dll))
$(eval $(call gb_ExternalPackage_add_file,xmlsec,$(LIBO_LIB_FOLDER)/libxmlsec-mscng.dll,win32/binaries/libxmlsec-mscng.dll)) $(eval $(call gb_ExternalPackage_add_file,xmlsec,$(LIBO_LIB_FOLDER)/libxmlsec-mscng.dll,win32/binaries/libxmlsec-mscng.dll))
$(eval $(call gb_ExternalPackage_add_file,xmlsec,$(LIBO_LIB_FOLDER)/libxmlsec.dll,win32/binaries/libxmlsec.dll)) $(eval $(call gb_ExternalPackage_add_file,xmlsec,$(LIBO_LIB_FOLDER)/libxmlsec.dll,win32/binaries/libxmlsec.dll))
endif endif
......
...@@ -23,7 +23,7 @@ $(eval $(call gb_ExternalProject_use_nmake,xmlsec,build)) ...@@ -23,7 +23,7 @@ $(eval $(call gb_ExternalProject_use_nmake,xmlsec,build))
$(call gb_ExternalProject_get_state_target,xmlsec,build) : $(call gb_ExternalProject_get_state_target,xmlsec,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
cscript /e:javascript configure.js crypto=mscrypto$(COMMA)mscng xslt=no iconv=no static=no \ cscript /e:javascript configure.js crypto=mscng xslt=no iconv=no static=no \
lib=$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc \ lib=$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc \
$(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \ $(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \
&& nmake \ && nmake \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment