strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Automated merge with http://hg-lan.germany.sun.com/ooo/DEV300

Browse source
This commit is contained in:
Ocke.Janssen 2010-10-28 14:18:49 +02:00
commit 562945f7bf
2 changed files with 44 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
solenv/inc/_tg_rslb.mk
View file

@ -31,7 +31,8 @@ $(RSC_MULTI1) : \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB1NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@ -46,7 +47,8 @@ $(RSC_MULTI1) : \
-fs={$(BIN)/$(RESLIB1NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
@ -108,7 +110,8 @@ $(RSC_MULTI2) : \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB2NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@ -123,7 +126,8 @@ $(RSC_MULTI2) : \
-fs={$(BIN)/$(RESLIB2NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
@ -185,7 +189,8 @@ $(RSC_MULTI3) : \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB3NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@ -200,7 +205,8 @@ $(RSC_MULTI3) : \
-fs={$(BIN)/$(RESLIB3NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
@ -262,7 +268,8 @@ $(RSC_MULTI4) : \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB4NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@ -277,7 +284,8 @@ $(RSC_MULTI4) : \
-fs={$(BIN)/$(RESLIB4NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
@ -339,7 +347,8 @@ $(RSC_MULTI5) : \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB5NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@ -354,7 +363,8 @@ $(RSC_MULTI5) : \
-fs={$(BIN)/$(RESLIB5NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
@ -416,7 +426,8 @@ $(RSC_MULTI6) : \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB6NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@ -431,7 +442,8 @@ $(RSC_MULTI6) : \
-fs={$(BIN)/$(RESLIB6NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
@ -493,7 +505,8 @@ $(RSC_MULTI7) : \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB7NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@ -508,7 +521,8 @@ $(RSC_MULTI7) : \
-fs={$(BIN)/$(RESLIB7NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
@ -570,7 +584,8 @@ $(RSC_MULTI8) : \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB8NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@ -585,7 +600,8 @@ $(RSC_MULTI8) : \
-fs={$(BIN)/$(RESLIB8NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
@ -647,7 +663,8 @@ $(RSC_MULTI9) : \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB9NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@ -662,7 +679,8 @@ $(RSC_MULTI9) : \
-fs={$(BIN)/$(RESLIB9NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
@ -724,7 +742,8 @@ $(RSC_MULTI10) : \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB10NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@ -739,7 +758,8 @@ $(RSC_MULTI10) : \
-fs={$(BIN)/$(RESLIB10NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \

6
solenv/inc/tg_rslb.mk
View file

@ -59,7 +59,8 @@ $(RSC_MULTI$(TNR)) : \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB$(TNR)NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@ -74,7 +75,8 @@ $(RSC_MULTI$(TNR)) : \
-fs={$(BIN)/$(RESLIB$(TNR)NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \
-lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \
-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \