summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2011-10-05 11:28:48 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2011-10-05 11:31:58 +0200
commit0bd11cfd85cea5fb2dec0c2fc0da49fb522ab7b3 (patch)
treed68f156780b93a4aa92b757c2a8e738b88d7f1d2 /ucb
parent2718b9b11afbac56ff39967317fb06bdb1298820 (diff)
Use the old way to build libcmis and cmis ucp ATM
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/ucp/cmis/makefile.mk18
1 files changed, 17 insertions, 1 deletions
diff --git a/ucb/source/ucp/cmis/makefile.mk b/ucb/source/ucp/cmis/makefile.mk
index a416316bf0ea..5db9e92f7a66 100644
--- a/ucb/source/ucp/cmis/makefile.mk
+++ b/ucb/source/ucp/cmis/makefile.mk
@@ -39,6 +39,20 @@ NO_BSYMBOLIC=TRUE
.IF "$(ENABLE_CMIS)"=="TRUE"
+.IF "$(GUI)"=="UNX" || "$(GUI)$(COM)"=="WNTGCC"
+
+.IF "$(SYSTEM_LIBCMIS)"=="YES"
+CMISLIB=$(LIBCMIS_LIBS)
+.ELSE
+CMISLIB=-lcmislib
+.ENDIF
+
+.ELSE
+
+CMISLIB=$(LIBPRE) cmislib.lib
+
+.ENDIF
+
# no "lib" prefix
DLLPRE =
@@ -57,7 +71,9 @@ SHL1STDLIBS=\
$(SALHELPERLIB) \
$(UCBHELPERLIB) \
$(TOOLSLIB) \
- $(CMISLIB)
+ $(CMISLIB) \
+ $(CURLLIB) \
+ $(LIBXML2LIB)
SHL1VERSIONMAP=$(SOLARENV)/src/component.map