diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:08:41 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:08:41 +0000 |
| commit | c8fcc5730a7db4b86970ea9a516869c27b624cb1 (patch) | |
| tree | 54199a29ac1400f8ed97fa8c243f5850eb7ca1a6 /solenv/inc | |
| parent | 62e5894bc767fc440c8d11d4f04cd327f6a2bbc5 (diff) | |
INTEGRATION: CWS sb83 (1.221.18); FILE MERGED
2008/03/17 09:00:31 sb 1.221.18.7: RESYNC: (1.225-1.228); FILE MERGED
2008/02/06 14:11:50 sb 1.221.18.6: #i84200# streamlined image set processing
2008/02/01 13:28:02 sb 1.221.18.5: RESYNC: (1.224-1.225); FILE MERGED
2008/02/01 11:02:16 sb 1.221.18.4: #i84200# added SHLnRPATH=OXT for libraries within extensions (that only link against URE libs)
2008/01/09 10:51:16 sb 1.221.18.3: RESYNC: (1.222-1.224); FILE MERGED
2007/12/03 14:01:03 sb 1.221.18.2: RESYNC: (1.221-1.222); FILE MERGED
2007/12/03 13:42:35 sb 1.221.18.1: #i84200# Added LINKFLAGSRUNPATH_BRAND.
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/settings.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 15672978bbe6..6fd6c47f9f1c 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -4,9 +4,9 @@ # # $RCSfile: settings.mk,v $ # -# $Revision: 1.228 $ +# $Revision: 1.229 $ # -# last change: $Author: kz $ $Date: 2008-03-06 15:14:58 $ +# last change: $Author: vg $ $Date: 2008-03-18 13:08:41 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -941,9 +941,6 @@ RSCEXTINC=. RSCDEFS+= -DDEBUG .ENDIF -# additional image sets -CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango - # settings for mozilla idl compiler XPIDL=xpidl XPIDL_LINK=xpt_link @@ -1203,6 +1200,8 @@ RCLINKFLAGS+= $(ENVRCLINKFLAGS) LINKFLAGSRUNPATH_URELIB*= LINKFLAGSRUNPATH_UREBIN*= LINKFLAGSRUNPATH_OOO*= +LINKFLAGSRUNPATH_BRAND*= +LINKFLAGSRUNPATH_OXT*= # make sure both linker variables are set LINKC*=$(LINK) |