diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2010-05-28 09:07:07 +0200 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2010-05-28 09:07:07 +0200 |
| commit | fe0f05bd34f3c05179720087c874acb8b1a0321b (patch) | |
| tree | c59b5c0d74a3e2b44ee999abe4d20988a0e3e855 /solenv | |
| parent | 5a797e371db41b31a3540e8a91e614e97c40aa10 (diff) | |
| parent | b555f9da35bdedce52001eee945a6fcd6ad7a1ad (diff) | |
CWS-TOOLING: integrate CWS xmlsec1_2_14
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/libs.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 9f758f687a3e..7237832e1cd3 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -166,10 +166,10 @@ LIBXML2LIB=-lxml2 NSS3LIB=-lnss3 NSPR4LIB=-lnspr4 PLC4LIB=-lplc4 -NSSCRYPTOLIBS=$(LIBXML2LIB) $(XMLSECLIB) $(XMLSECLIB-NSS) $(NSS3LIB) $(NSPR4LIB) $(PLC4LIB) +NSSCRYPTOLIBS=$(XMLSECLIB-NSS) $(XMLSECLIB) $(LIBXML2LIB) $(NSS3LIB) $(NSPR4LIB) $(PLC4LIB) .IF "$(GUI)$(COM)"=="WNTGCC" XMLSECLIB-MS=-lxmlsec1-mscrypto -MSCRYPTOLIBS=$(LIBXML2LIB) $(XMLSECLIB) $(XMLSECLIB-MS) $(CRYPT32LIB) $(ADVAPI32LIB) +MSCRYPTOLIBS=$(XMLSECLIB) $(XMLSECLIB-MS) $(LIBXML2LIB) $(CRYPT32LIB) $(ADVAPI32LIB) .ENDIF # "$(GUI)$(COM)"=="WNTGCC" BROOKERLIB=-lbrooker$(DLLPOSTFIX) SIMPLECMLIB=-lsimplecm$(DLLPOSTFIX) @@ -418,8 +418,8 @@ LIBXML2LIB=libxml2.lib NSS3LIB=nss3.lib NSPR4LIB=nspr4.lib PLC4LIB=plc4.lib -NSSCRYPTOLIBS=$(LIBXML2LIB) $(XMLSECLIB) $(XMLSECLIB-NSS) $(NSS3LIB) $(NSPR4LIB) $(PLC4LIB) -MSCRYPTOLIBS=$(LIBXML2LIB) $(XMLSECLIB) $(XMLSECLIB-MS) crypt32.lib advapi32.lib +NSSCRYPTOLIBS=$(XMLSECLIB-NSS) $(XMLSECLIB) $(LIBXML2LIB) $(NSS3LIB) $(NSPR4LIB) $(PLC4LIB) +MSCRYPTOLIBS=$(XMLSECLIB-MS) $(XMLSECLIB) $(LIBXML2LIB) crypt32.lib advapi32.lib BROOKERLIB=ibrooker.lib SIMPLECMLIB=isimplecm.lib COMMUNILIB=icommuni.lib |