diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:08:12 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:08:12 +0000 |
| commit | cf2bee5597df113ba3fedbd535e17fcb2dc94934 (patch) | |
| tree | 3c1155c850b15ebc8aa72434cd6753391434beed /jvmfwk | |
| parent | 4af0de922d90084ccd247564456ef64b846e0542 (diff) | |
INTEGRATION: CWS sb71 (1.11.4); FILE MERGED
2007/10/01 17:35:02 sb 1.11.4.5: RESYNC: (1.11-1.12); FILE MERGED
2007/08/13 14:36:02 sb 1.11.4.4: #i77184# Both XML2LIB and LIBXML2LIB were used; drop XML2LIB in favor of LIBXML2LIB.
2007/08/13 11:48:18 sb 1.11.4.3: #i77184# Dropped libxml2wrapper again (do not use /DELAYLOAD for libxml2---to much trouble).
2007/07/23 13:41:03 sb 1.11.4.2: #i77184# Introduced libxml2wrapper.
2007/06/14 14:54:55 sb 1.11.4.1: #i75466# Adapted to new APP|SHLnRPATH.
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/source/makefile.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/jvmfwk/source/makefile.mk b/jvmfwk/source/makefile.mk index d3880cae021b..fbc43ae701a6 100644 --- a/jvmfwk/source/makefile.mk +++ b/jvmfwk/source/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.12 $ +# $Revision: 1.13 $ # -# last change: $Author: vg $ $Date: 2007-09-20 14:32:20 $ +# last change: $Author: vg $ $Date: 2007-10-15 12:08:12 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -71,7 +71,8 @@ SHL1TARGET = $(FRAMEWORKLIB) SHL1DEPN= SHL1IMPLIB = i$(FRAMEWORKLIB) SHL1LIBS = $(SLB)$/$(TARGET).lib -SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(SALHELPERLIB) $(XML2LIB) +SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(SALHELPERLIB) $(LIBXML2LIB) +SHL1RPATH = URELIB .IF "$(OS)" == "WNT" SHL1STDLIBS += $(ADVAPI32LIB) |