diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-07-09 09:42:01 -0400 |
|---|---|---|
| committer | Ashod Nakashian <ashnakash@gmail.com> | 2017-07-17 00:12:10 +0200 |
| commit | 4f17445c12dc26c4881c4e486215b58d26515f8d (patch) | |
| tree | d5532f4a3129fe532b4ad4305a44a8817c7e8b41 /svl/Library_svl.mk | |
| parent | c76c3655a394462b7b23bdfe6da4542fbdf30fbb (diff) | |
svl: move byte-array verification from vcl
Also use comphelper::Base64 and
DateTime::CreateFromUnixTime to avoid depending on sax.
Change-Id: If1853f8d9481c9caa0625a111707531bbc495f75
Reviewed-on: https://gerrit.libreoffice.org/39993
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Diffstat (limited to 'svl/Library_svl.mk')
| -rw-r--r-- | svl/Library_svl.mk | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index e3969b1d90a3..97fa4df3add9 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -95,6 +95,25 @@ $(eval $(call gb_Library_use_system_win32_libs,svl,\ shlwapi \ )) +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_defs,svl,\ + -DSVL_CRYPTO_MSCRYPTO \ +)) +$(eval $(call gb_Library_use_system_win32_libs,svl,\ + crypt32 \ +)) +else +ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) +$(eval $(call gb_Library_add_defs,svl,\ + -DSVL_CRYPTO_NSS \ +)) +$(eval $(call gb_Library_use_externals,svl,\ + nss3 \ + plc4 \ +)) +endif # BUILD_TYPE=DESKTOP +endif + $(eval $(call gb_Library_add_exception_objects,svl,\ svl/source/config/asiancfg \ svl/source/config/cjkoptions \ |