diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-19 10:42:44 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-19 10:42:44 +0000 |
| commit | 489fff74fd248b513480d6c03a605703c671f1c4 (patch) | |
| tree | 052289d38422652157866536a8d9133251b871c3 /solenv/inc/tg_rslb.mk | |
| parent | 01f1c00720bd0576f6d4e18db67a548103769986 (diff) | |
INTEGRATION: CWS oooicons (1.12.56); FILE MERGED
2004/10/08 12:39:00 hjs 1.12.56.1: #i35193# changed image location; changed customizing
Diffstat (limited to 'solenv/inc/tg_rslb.mk')
| -rw-r--r-- | solenv/inc/tg_rslb.mk | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/solenv/inc/tg_rslb.mk b/solenv/inc/tg_rslb.mk index 3031b7f299b3..520afc3b5114 100644 --- a/solenv/inc/tg_rslb.mk +++ b/solenv/inc/tg_rslb.mk @@ -2,9 +2,9 @@ # # $RCSfile: tg_rslb.mk,v $ # -# $Revision: 1.12 $ +# $Revision: 1.13 $ # -# last change: $Author: hjs $ $Date: 2004-07-23 14:15:05 $ +# last change: $Author: obo $ $Date: 2004-11-19 11:42:44 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -121,12 +121,11 @@ $(RSC_MULTI$(TNR)) : \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION)$i.res} \ - $(foreach,j,$(subst,$(PRJ),$(PRJ)$/..$/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}$/$i \ + $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}$/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)$/res$/$i -lip=$(SOLARSRC)$/res ) \ - -subMODULE=$(PRJ)$/.. \ - -subGLOBAL=$(SOLARSRC) \ - -subCUSTOM=to_be_defined \ + -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ + -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \ + -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \ -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ -ft=$@ \ -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \ @@ -138,12 +137,11 @@ $(RSC_MULTI$(TNR)) : \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ -fs={$(BIN)$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION)$i.res} \ - $(foreach,j,$(subst,$(PRJ),$(PRJ)$/..$/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}$/$i \ + $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}$/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)$/res$/$i -lip=$(SOLARSRC)$/res ) \ - -subGLOBAL=$(SOLARSRC) \ - -subMODULE=$(PRJ)$/.. \ - -subCUSTOM=to_be_defined \ + -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ + -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \ + -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \ -oil=$(BIN) \ -ft=$@ \ -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \ |