diff --git a/solenv/inc/_tg_rslb.mk b/solenv/inc/_tg_rslb.mk
index 3ff005c9f8d7..81351d0fe4f3 100644
--- a/solenv/inc/_tg_rslb.mk
+++ b/solenv/inc/_tg_rslb.mk
@@ -2,15 +2,50 @@
 
 .IF "$(RESLIB1TARGETN)"!=""
 
+$(RSC_MULTI1) : \
+        $(RESLIB1SRSFILES) \
+        $(RESLIB1TARGETN) \
+        $(RESLIB1BMPS)
+.IF "$(rsc_once)"!=""
+    @+echo using rsc multi-res feature
+.IF "$(common_build_reslib)"!=""
+    $(RSC) -presponse @$(mktmp \
+    -r -p \
+    $(foreach,i,$(alllangext) $(rsclang_{$i}) \
+    $(rescharset_{$i}) \
+    -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)$(UPD)$i.res} \
+    -lip{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(i)}) ) \
+    -ft$@ \
+    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
+    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    $(RSC1HEADER) $(RESLIB1SRSFILES) \
+    ) > $(NULLDEV)
+.ELSE			# "$(common_build_reslib)"!=""
+    $(RSC) -presponse @$(mktmp \
+    -r -p \
+    $(foreach,i,$(alllangext) $(rsclang_{$i}) \
+    $(rescharset_{$i}) \
+    -fs{$(BIN)$/$(RESLIB1NAME)$(UPD)$i.res} \
+    -lip{$(RES)}$/$(langext_{$(i)}) ) \
+    -ft$@ \
+    -I{$(RES)}$/$(defaultlangext) \
+    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    $(RSC1HEADER) $(RESLIB1SRSFILES) \
+    ) > $(NULLDEV)
+.ENDIF			# "$(common_build_reslib)"!=""
+.ENDIF           # "$(rsc_once)"!=""
+
 $(RESLIB1TARGETN): \
         $(RESLIB1SRSFILES) \
         $(RESLIB1BMPS)
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI1) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
-    -r \
+    -r -p \
     $(rsclang_{$(subst,$(RESLIB1NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB1NAME)$(UPD), $(@:b))}) \
     -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB1NAME)$(UPD), $(@:b))}) \
@@ -22,7 +57,11 @@ $(RESLIB1TARGETN): \
     +$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.new >& $(NULLDEV)
     +-$(RM) $@ >& $(NULLDEV)
     +$(RENAME) $@.new $@
+.ENDIF          # "$(rsc_once)"!=""
 .ELSE			# "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI1) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     -r \
     $(rsclang_{$(subst,$(RESLIB1NAME)$(UPD), $(@:b))}) \
@@ -33,22 +72,13 @@ $(RESLIB1TARGETN): \
     -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC1HEADER) $(RESLIB1SRSFILES) \
     )
+.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
-.ELSE			# "$(NO_REC_RES)"!=""
-    $(RSC) -presponse @$(mktmp \
-    -r \
-    $(rsclang_{$(subst,$(RESLIB1NAME)$(UPD), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB1NAME)$(UPD), $(@:b))}) \
-    -I$(RES) \
-    -fs$@ \
-    -I$(PRJ)$/$(INPATH)$/res \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
-    $(RSC1HEADER) $(RESLIB1SRSFILES) \
-    )
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ELSE				# "$(GUI)"=="UNX"
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI1) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     $(rsclang_{$(subst,$(RESLIB1NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB1NAME)$(UPD), $(@:b))}) \
@@ -63,7 +93,11 @@ $(RESLIB1TARGETN): \
     +-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.new >& $(NULLDEV)
     +-$(RM) $@ >& $(NULLDEV)
     +$(RENAME) $@.new $@
+.ENDIF          # "$(rsc_once)"!=""
 .ELSE			# "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI1) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     $(rsclang_{$(subst,$(RESLIB1NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB1NAME)$(UPD), $(@:b))}) \
@@ -75,39 +109,61 @@ $(RESLIB1TARGETN): \
     -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
     $(RSC1HEADER) $(RESLIB1SRSFILES) \
     )
+.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
-.ELSE			# "$(NO_REC_RES)"!=""
-    $(RSC) -presponse @$(mktmp \
-    $(rsclang_{$(subst,$(RESLIB1NAME)$(UPD), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB1NAME)$(UPD), $(@:b))}) \
-    -I$(RES) \
-    -fs$@ \
-    -r -p \
-    -I$(RES) \
-    -I$(PRJ)$/$(INPATH)$/res \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC1HEADER) $(RESLIB1SRSFILES) \
-    )
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ENDIF              # "$(GUI)"=="UNX"
 .ENDIF				# "$(RESLIB1TARGETN)"!=""
 
 
 # Anweisungen fuer das Linken
-#next Target
 # unroll begin
 
 .IF "$(RESLIB2TARGETN)"!=""
 
+$(RSC_MULTI2) : \
+        $(RESLIB2SRSFILES) \
+        $(RESLIB2TARGETN) \
+        $(RESLIB2BMPS)
+.IF "$(rsc_once)"!=""
+    @+echo using rsc multi-res feature
+.IF "$(common_build_reslib)"!=""
+    $(RSC) -presponse @$(mktmp \
+    -r -p \
+    $(foreach,i,$(alllangext) $(rsclang_{$i}) \
+    $(rescharset_{$i}) \
+    -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)$(UPD)$i.res} \
+    -lip{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(i)}) ) \
+    -ft$@ \
+    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
+    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    $(RSC2HEADER) $(RESLIB2SRSFILES) \
+    ) > $(NULLDEV)
+.ELSE			# "$(common_build_reslib)"!=""
+    $(RSC) -presponse @$(mktmp \
+    -r -p \
+    $(foreach,i,$(alllangext) $(rsclang_{$i}) \
+    $(rescharset_{$i}) \
+    -fs{$(BIN)$/$(RESLIB2NAME)$(UPD)$i.res} \
+    -lip{$(RES)}$/$(langext_{$(i)}) ) \
+    -ft$@ \
+    -I{$(RES)}$/$(defaultlangext) \
+    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    $(RSC2HEADER) $(RESLIB2SRSFILES) \
+    ) > $(NULLDEV)
+.ENDIF			# "$(common_build_reslib)"!=""
+.ENDIF           # "$(rsc_once)"!=""
+
 $(RESLIB2TARGETN): \
         $(RESLIB2SRSFILES) \
         $(RESLIB2BMPS)
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI2) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
-    -r \
+    -r -p \
     $(rsclang_{$(subst,$(RESLIB2NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB2NAME)$(UPD), $(@:b))}) \
     -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB2NAME)$(UPD), $(@:b))}) \
@@ -119,7 +175,11 @@ $(RESLIB2TARGETN): \
     +$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.new >& $(NULLDEV)
     +-$(RM) $@ >& $(NULLDEV)
     +$(RENAME) $@.new $@
+.ENDIF          # "$(rsc_once)"!=""
 .ELSE			# "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI2) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     -r \
     $(rsclang_{$(subst,$(RESLIB2NAME)$(UPD), $(@:b))}) \
@@ -130,22 +190,13 @@ $(RESLIB2TARGETN): \
     -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC2HEADER) $(RESLIB2SRSFILES) \
     )
+.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
-.ELSE			# "$(NO_REC_RES)"!=""
-    $(RSC) -presponse @$(mktmp \
-    -r \
-    $(rsclang_{$(subst,$(RESLIB2NAME)$(UPD), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB2NAME)$(UPD), $(@:b))}) \
-    -I$(RES) \
-    -fs$@ \
-    -I$(PRJ)$/$(INPATH)$/res \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
-    $(RSC2HEADER) $(RESLIB2SRSFILES) \
-    )
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ELSE				# "$(GUI)"=="UNX"
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI2) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     $(rsclang_{$(subst,$(RESLIB2NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB2NAME)$(UPD), $(@:b))}) \
@@ -160,7 +211,11 @@ $(RESLIB2TARGETN): \
     +-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.new >& $(NULLDEV)
     +-$(RM) $@ >& $(NULLDEV)
     +$(RENAME) $@.new $@
+.ENDIF          # "$(rsc_once)"!=""
 .ELSE			# "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI2) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     $(rsclang_{$(subst,$(RESLIB2NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB2NAME)$(UPD), $(@:b))}) \
@@ -172,39 +227,61 @@ $(RESLIB2TARGETN): \
     -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
     $(RSC2HEADER) $(RESLIB2SRSFILES) \
     )
+.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
-.ELSE			# "$(NO_REC_RES)"!=""
-    $(RSC) -presponse @$(mktmp \
-    $(rsclang_{$(subst,$(RESLIB2NAME)$(UPD), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB2NAME)$(UPD), $(@:b))}) \
-    -I$(RES) \
-    -fs$@ \
-    -r -p \
-    -I$(RES) \
-    -I$(PRJ)$/$(INPATH)$/res \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC2HEADER) $(RESLIB2SRSFILES) \
-    )
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ENDIF              # "$(GUI)"=="UNX"
 .ENDIF				# "$(RESLIB2TARGETN)"!=""
 
 
 # Anweisungen fuer das Linken
-#next Target
 # unroll begin
 
 .IF "$(RESLIB3TARGETN)"!=""
 
+$(RSC_MULTI3) : \
+        $(RESLIB3SRSFILES) \
+        $(RESLIB3TARGETN) \
+        $(RESLIB3BMPS)
+.IF "$(rsc_once)"!=""
+    @+echo using rsc multi-res feature
+.IF "$(common_build_reslib)"!=""
+    $(RSC) -presponse @$(mktmp \
+    -r -p \
+    $(foreach,i,$(alllangext) $(rsclang_{$i}) \
+    $(rescharset_{$i}) \
+    -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)$(UPD)$i.res} \
+    -lip{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(i)}) ) \
+    -ft$@ \
+    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
+    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    $(RSC3HEADER) $(RESLIB3SRSFILES) \
+    ) > $(NULLDEV)
+.ELSE			# "$(common_build_reslib)"!=""
+    $(RSC) -presponse @$(mktmp \
+    -r -p \
+    $(foreach,i,$(alllangext) $(rsclang_{$i}) \
+    $(rescharset_{$i}) \
+    -fs{$(BIN)$/$(RESLIB3NAME)$(UPD)$i.res} \
+    -lip{$(RES)}$/$(langext_{$(i)}) ) \
+    -ft$@ \
+    -I{$(RES)}$/$(defaultlangext) \
+    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    $(RSC3HEADER) $(RESLIB3SRSFILES) \
+    ) > $(NULLDEV)
+.ENDIF			# "$(common_build_reslib)"!=""
+.ENDIF           # "$(rsc_once)"!=""
+
 $(RESLIB3TARGETN): \
         $(RESLIB3SRSFILES) \
         $(RESLIB3BMPS)
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI3) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
-    -r \
+    -r -p \
     $(rsclang_{$(subst,$(RESLIB3NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB3NAME)$(UPD), $(@:b))}) \
     -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB3NAME)$(UPD), $(@:b))}) \
@@ -216,7 +293,11 @@ $(RESLIB3TARGETN): \
     +$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.new >& $(NULLDEV)
     +-$(RM) $@ >& $(NULLDEV)
     +$(RENAME) $@.new $@
+.ENDIF          # "$(rsc_once)"!=""
 .ELSE			# "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI3) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     -r \
     $(rsclang_{$(subst,$(RESLIB3NAME)$(UPD), $(@:b))}) \
@@ -227,22 +308,13 @@ $(RESLIB3TARGETN): \
     -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC3HEADER) $(RESLIB3SRSFILES) \
     )
+.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
-.ELSE			# "$(NO_REC_RES)"!=""
-    $(RSC) -presponse @$(mktmp \
-    -r \
-    $(rsclang_{$(subst,$(RESLIB3NAME)$(UPD), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB3NAME)$(UPD), $(@:b))}) \
-    -I$(RES) \
-    -fs$@ \
-    -I$(PRJ)$/$(INPATH)$/res \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
-    $(RSC3HEADER) $(RESLIB3SRSFILES) \
-    )
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ELSE				# "$(GUI)"=="UNX"
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI3) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     $(rsclang_{$(subst,$(RESLIB3NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB3NAME)$(UPD), $(@:b))}) \
@@ -257,7 +329,11 @@ $(RESLIB3TARGETN): \
     +-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.new >& $(NULLDEV)
     +-$(RM) $@ >& $(NULLDEV)
     +$(RENAME) $@.new $@
+.ENDIF          # "$(rsc_once)"!=""
 .ELSE			# "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI3) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     $(rsclang_{$(subst,$(RESLIB3NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB3NAME)$(UPD), $(@:b))}) \
@@ -269,39 +345,61 @@ $(RESLIB3TARGETN): \
     -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
     $(RSC3HEADER) $(RESLIB3SRSFILES) \
     )
+.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
-.ELSE			# "$(NO_REC_RES)"!=""
-    $(RSC) -presponse @$(mktmp \
-    $(rsclang_{$(subst,$(RESLIB3NAME)$(UPD), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB3NAME)$(UPD), $(@:b))}) \
-    -I$(RES) \
-    -fs$@ \
-    -r -p \
-    -I$(RES) \
-    -I$(PRJ)$/$(INPATH)$/res \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC3HEADER) $(RESLIB3SRSFILES) \
-    )
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ENDIF              # "$(GUI)"=="UNX"
 .ENDIF				# "$(RESLIB3TARGETN)"!=""
 
 
 # Anweisungen fuer das Linken
-#next Target
 # unroll begin
 
 .IF "$(RESLIB4TARGETN)"!=""
 
+$(RSC_MULTI4) : \
+        $(RESLIB4SRSFILES) \
+        $(RESLIB4TARGETN) \
+        $(RESLIB4BMPS)
+.IF "$(rsc_once)"!=""
+    @+echo using rsc multi-res feature
+.IF "$(common_build_reslib)"!=""
+    $(RSC) -presponse @$(mktmp \
+    -r -p \
+    $(foreach,i,$(alllangext) $(rsclang_{$i}) \
+    $(rescharset_{$i}) \
+    -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)$(UPD)$i.res} \
+    -lip{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(i)}) ) \
+    -ft$@ \
+    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
+    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    $(RSC4HEADER) $(RESLIB4SRSFILES) \
+    ) > $(NULLDEV)
+.ELSE			# "$(common_build_reslib)"!=""
+    $(RSC) -presponse @$(mktmp \
+    -r -p \
+    $(foreach,i,$(alllangext) $(rsclang_{$i}) \
+    $(rescharset_{$i}) \
+    -fs{$(BIN)$/$(RESLIB4NAME)$(UPD)$i.res} \
+    -lip{$(RES)}$/$(langext_{$(i)}) ) \
+    -ft$@ \
+    -I{$(RES)}$/$(defaultlangext) \
+    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    $(RSC4HEADER) $(RESLIB4SRSFILES) \
+    ) > $(NULLDEV)
+.ENDIF			# "$(common_build_reslib)"!=""
+.ENDIF           # "$(rsc_once)"!=""
+
 $(RESLIB4TARGETN): \
         $(RESLIB4SRSFILES) \
         $(RESLIB4BMPS)
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI4) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
-    -r \
+    -r -p \
     $(rsclang_{$(subst,$(RESLIB4NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB4NAME)$(UPD), $(@:b))}) \
     -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB4NAME)$(UPD), $(@:b))}) \
@@ -313,7 +411,11 @@ $(RESLIB4TARGETN): \
     +$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.new >& $(NULLDEV)
     +-$(RM) $@ >& $(NULLDEV)
     +$(RENAME) $@.new $@
+.ENDIF          # "$(rsc_once)"!=""
 .ELSE			# "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI4) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     -r \
     $(rsclang_{$(subst,$(RESLIB4NAME)$(UPD), $(@:b))}) \
@@ -324,22 +426,13 @@ $(RESLIB4TARGETN): \
     -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC4HEADER) $(RESLIB4SRSFILES) \
     )
+.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
-.ELSE			# "$(NO_REC_RES)"!=""
-    $(RSC) -presponse @$(mktmp \
-    -r \
-    $(rsclang_{$(subst,$(RESLIB4NAME)$(UPD), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB4NAME)$(UPD), $(@:b))}) \
-    -I$(RES) \
-    -fs$@ \
-    -I$(PRJ)$/$(INPATH)$/res \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
-    $(RSC4HEADER) $(RESLIB4SRSFILES) \
-    )
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ELSE				# "$(GUI)"=="UNX"
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI4) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     $(rsclang_{$(subst,$(RESLIB4NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB4NAME)$(UPD), $(@:b))}) \
@@ -354,7 +447,11 @@ $(RESLIB4TARGETN): \
     +-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.new >& $(NULLDEV)
     +-$(RM) $@ >& $(NULLDEV)
     +$(RENAME) $@.new $@
+.ENDIF          # "$(rsc_once)"!=""
 .ELSE			# "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI4) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     $(rsclang_{$(subst,$(RESLIB4NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB4NAME)$(UPD), $(@:b))}) \
@@ -366,39 +463,61 @@ $(RESLIB4TARGETN): \
     -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
     $(RSC4HEADER) $(RESLIB4SRSFILES) \
     )
+.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
-.ELSE			# "$(NO_REC_RES)"!=""
-    $(RSC) -presponse @$(mktmp \
-    $(rsclang_{$(subst,$(RESLIB4NAME)$(UPD), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB4NAME)$(UPD), $(@:b))}) \
-    -I$(RES) \
-    -fs$@ \
-    -r -p \
-    -I$(RES) \
-    -I$(PRJ)$/$(INPATH)$/res \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC4HEADER) $(RESLIB4SRSFILES) \
-    )
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ENDIF              # "$(GUI)"=="UNX"
 .ENDIF				# "$(RESLIB4TARGETN)"!=""
 
 
 # Anweisungen fuer das Linken
-#next Target
 # unroll begin
 
 .IF "$(RESLIB5TARGETN)"!=""
 
+$(RSC_MULTI5) : \
+        $(RESLIB5SRSFILES) \
+        $(RESLIB5TARGETN) \
+        $(RESLIB5BMPS)
+.IF "$(rsc_once)"!=""
+    @+echo using rsc multi-res feature
+.IF "$(common_build_reslib)"!=""
+    $(RSC) -presponse @$(mktmp \
+    -r -p \
+    $(foreach,i,$(alllangext) $(rsclang_{$i}) \
+    $(rescharset_{$i}) \
+    -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)$(UPD)$i.res} \
+    -lip{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(i)}) ) \
+    -ft$@ \
+    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
+    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    $(RSC5HEADER) $(RESLIB5SRSFILES) \
+    ) > $(NULLDEV)
+.ELSE			# "$(common_build_reslib)"!=""
+    $(RSC) -presponse @$(mktmp \
+    -r -p \
+    $(foreach,i,$(alllangext) $(rsclang_{$i}) \
+    $(rescharset_{$i}) \
+    -fs{$(BIN)$/$(RESLIB5NAME)$(UPD)$i.res} \
+    -lip{$(RES)}$/$(langext_{$(i)}) ) \
+    -ft$@ \
+    -I{$(RES)}$/$(defaultlangext) \
+    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    $(RSC5HEADER) $(RESLIB5SRSFILES) \
+    ) > $(NULLDEV)
+.ENDIF			# "$(common_build_reslib)"!=""
+.ENDIF           # "$(rsc_once)"!=""
+
 $(RESLIB5TARGETN): \
         $(RESLIB5SRSFILES) \
         $(RESLIB5BMPS)
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI5) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
-    -r \
+    -r -p \
     $(rsclang_{$(subst,$(RESLIB5NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB5NAME)$(UPD), $(@:b))}) \
     -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB5NAME)$(UPD), $(@:b))}) \
@@ -410,7 +529,11 @@ $(RESLIB5TARGETN): \
     +$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.new >& $(NULLDEV)
     +-$(RM) $@ >& $(NULLDEV)
     +$(RENAME) $@.new $@
+.ENDIF          # "$(rsc_once)"!=""
 .ELSE			# "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI5) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     -r \
     $(rsclang_{$(subst,$(RESLIB5NAME)$(UPD), $(@:b))}) \
@@ -421,22 +544,13 @@ $(RESLIB5TARGETN): \
     -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC5HEADER) $(RESLIB5SRSFILES) \
     )
+.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
-.ELSE			# "$(NO_REC_RES)"!=""
-    $(RSC) -presponse @$(mktmp \
-    -r \
-    $(rsclang_{$(subst,$(RESLIB5NAME)$(UPD), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB5NAME)$(UPD), $(@:b))}) \
-    -I$(RES) \
-    -fs$@ \
-    -I$(PRJ)$/$(INPATH)$/res \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
-    $(RSC5HEADER) $(RESLIB5SRSFILES) \
-    )
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ELSE				# "$(GUI)"=="UNX"
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI5) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     $(rsclang_{$(subst,$(RESLIB5NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB5NAME)$(UPD), $(@:b))}) \
@@ -451,7 +565,11 @@ $(RESLIB5TARGETN): \
     +-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.new >& $(NULLDEV)
     +-$(RM) $@ >& $(NULLDEV)
     +$(RENAME) $@.new $@
+.ENDIF          # "$(rsc_once)"!=""
 .ELSE			# "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI5) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     $(rsclang_{$(subst,$(RESLIB5NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB5NAME)$(UPD), $(@:b))}) \
@@ -463,39 +581,61 @@ $(RESLIB5TARGETN): \
     -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
     $(RSC5HEADER) $(RESLIB5SRSFILES) \
     )
+.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
-.ELSE			# "$(NO_REC_RES)"!=""
-    $(RSC) -presponse @$(mktmp \
-    $(rsclang_{$(subst,$(RESLIB5NAME)$(UPD), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB5NAME)$(UPD), $(@:b))}) \
-    -I$(RES) \
-    -fs$@ \
-    -r -p \
-    -I$(RES) \
-    -I$(PRJ)$/$(INPATH)$/res \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC5HEADER) $(RESLIB5SRSFILES) \
-    )
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ENDIF              # "$(GUI)"=="UNX"
 .ENDIF				# "$(RESLIB5TARGETN)"!=""
 
 
 # Anweisungen fuer das Linken
-#next Target
 # unroll begin
 
 .IF "$(RESLIB6TARGETN)"!=""
 
+$(RSC_MULTI6) : \
+        $(RESLIB6SRSFILES) \
+        $(RESLIB6TARGETN) \
+        $(RESLIB6BMPS)
+.IF "$(rsc_once)"!=""
+    @+echo using rsc multi-res feature
+.IF "$(common_build_reslib)"!=""
+    $(RSC) -presponse @$(mktmp \
+    -r -p \
+    $(foreach,i,$(alllangext) $(rsclang_{$i}) \
+    $(rescharset_{$i}) \
+    -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)$(UPD)$i.res} \
+    -lip{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(i)}) ) \
+    -ft$@ \
+    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
+    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    $(RSC6HEADER) $(RESLIB6SRSFILES) \
+    ) > $(NULLDEV)
+.ELSE			# "$(common_build_reslib)"!=""
+    $(RSC) -presponse @$(mktmp \
+    -r -p \
+    $(foreach,i,$(alllangext) $(rsclang_{$i}) \
+    $(rescharset_{$i}) \
+    -fs{$(BIN)$/$(RESLIB6NAME)$(UPD)$i.res} \
+    -lip{$(RES)}$/$(langext_{$(i)}) ) \
+    -ft$@ \
+    -I{$(RES)}$/$(defaultlangext) \
+    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    $(RSC6HEADER) $(RESLIB6SRSFILES) \
+    ) > $(NULLDEV)
+.ENDIF			# "$(common_build_reslib)"!=""
+.ENDIF           # "$(rsc_once)"!=""
+
 $(RESLIB6TARGETN): \
         $(RESLIB6SRSFILES) \
         $(RESLIB6BMPS)
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI6) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
-    -r \
+    -r -p \
     $(rsclang_{$(subst,$(RESLIB6NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB6NAME)$(UPD), $(@:b))}) \
     -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB6NAME)$(UPD), $(@:b))}) \
@@ -507,7 +647,11 @@ $(RESLIB6TARGETN): \
     +$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.new >& $(NULLDEV)
     +-$(RM) $@ >& $(NULLDEV)
     +$(RENAME) $@.new $@
+.ENDIF          # "$(rsc_once)"!=""
 .ELSE			# "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI6) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     -r \
     $(rsclang_{$(subst,$(RESLIB6NAME)$(UPD), $(@:b))}) \
@@ -518,22 +662,13 @@ $(RESLIB6TARGETN): \
     -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC6HEADER) $(RESLIB6SRSFILES) \
     )
+.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
-.ELSE			# "$(NO_REC_RES)"!=""
-    $(RSC) -presponse @$(mktmp \
-    -r \
-    $(rsclang_{$(subst,$(RESLIB6NAME)$(UPD), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB6NAME)$(UPD), $(@:b))}) \
-    -I$(RES) \
-    -fs$@ \
-    -I$(PRJ)$/$(INPATH)$/res \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
-    $(RSC6HEADER) $(RESLIB6SRSFILES) \
-    )
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ELSE				# "$(GUI)"=="UNX"
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI6) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     $(rsclang_{$(subst,$(RESLIB6NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB6NAME)$(UPD), $(@:b))}) \
@@ -548,7 +683,11 @@ $(RESLIB6TARGETN): \
     +-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.new >& $(NULLDEV)
     +-$(RM) $@ >& $(NULLDEV)
     +$(RENAME) $@.new $@
+.ENDIF          # "$(rsc_once)"!=""
 .ELSE			# "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI6) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     $(rsclang_{$(subst,$(RESLIB6NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB6NAME)$(UPD), $(@:b))}) \
@@ -560,39 +699,61 @@ $(RESLIB6TARGETN): \
     -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
     $(RSC6HEADER) $(RESLIB6SRSFILES) \
     )
+.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
-.ELSE			# "$(NO_REC_RES)"!=""
-    $(RSC) -presponse @$(mktmp \
-    $(rsclang_{$(subst,$(RESLIB6NAME)$(UPD), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB6NAME)$(UPD), $(@:b))}) \
-    -I$(RES) \
-    -fs$@ \
-    -r -p \
-    -I$(RES) \
-    -I$(PRJ)$/$(INPATH)$/res \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC6HEADER) $(RESLIB6SRSFILES) \
-    )
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ENDIF              # "$(GUI)"=="UNX"
 .ENDIF				# "$(RESLIB6TARGETN)"!=""
 
 
 # Anweisungen fuer das Linken
-#next Target
 # unroll begin
 
 .IF "$(RESLIB7TARGETN)"!=""
 
+$(RSC_MULTI7) : \
+        $(RESLIB7SRSFILES) \
+        $(RESLIB7TARGETN) \
+        $(RESLIB7BMPS)
+.IF "$(rsc_once)"!=""
+    @+echo using rsc multi-res feature
+.IF "$(common_build_reslib)"!=""
+    $(RSC) -presponse @$(mktmp \
+    -r -p \
+    $(foreach,i,$(alllangext) $(rsclang_{$i}) \
+    $(rescharset_{$i}) \
+    -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)$(UPD)$i.res} \
+    -lip{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(i)}) ) \
+    -ft$@ \
+    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
+    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    $(RSC7HEADER) $(RESLIB7SRSFILES) \
+    ) > $(NULLDEV)
+.ELSE			# "$(common_build_reslib)"!=""
+    $(RSC) -presponse @$(mktmp \
+    -r -p \
+    $(foreach,i,$(alllangext) $(rsclang_{$i}) \
+    $(rescharset_{$i}) \
+    -fs{$(BIN)$/$(RESLIB7NAME)$(UPD)$i.res} \
+    -lip{$(RES)}$/$(langext_{$(i)}) ) \
+    -ft$@ \
+    -I{$(RES)}$/$(defaultlangext) \
+    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    $(RSC7HEADER) $(RESLIB7SRSFILES) \
+    ) > $(NULLDEV)
+.ENDIF			# "$(common_build_reslib)"!=""
+.ENDIF           # "$(rsc_once)"!=""
+
 $(RESLIB7TARGETN): \
         $(RESLIB7SRSFILES) \
         $(RESLIB7BMPS)
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI7) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
-    -r \
+    -r -p \
     $(rsclang_{$(subst,$(RESLIB7NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB7NAME)$(UPD), $(@:b))}) \
     -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB7NAME)$(UPD), $(@:b))}) \
@@ -604,7 +765,11 @@ $(RESLIB7TARGETN): \
     +$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.new >& $(NULLDEV)
     +-$(RM) $@ >& $(NULLDEV)
     +$(RENAME) $@.new $@
+.ENDIF          # "$(rsc_once)"!=""
 .ELSE			# "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI7) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     -r \
     $(rsclang_{$(subst,$(RESLIB7NAME)$(UPD), $(@:b))}) \
@@ -615,22 +780,13 @@ $(RESLIB7TARGETN): \
     -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC7HEADER) $(RESLIB7SRSFILES) \
     )
+.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
-.ELSE			# "$(NO_REC_RES)"!=""
-    $(RSC) -presponse @$(mktmp \
-    -r \
-    $(rsclang_{$(subst,$(RESLIB7NAME)$(UPD), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB7NAME)$(UPD), $(@:b))}) \
-    -I$(RES) \
-    -fs$@ \
-    -I$(PRJ)$/$(INPATH)$/res \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
-    $(RSC7HEADER) $(RESLIB7SRSFILES) \
-    )
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ELSE				# "$(GUI)"=="UNX"
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI7) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     $(rsclang_{$(subst,$(RESLIB7NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB7NAME)$(UPD), $(@:b))}) \
@@ -645,7 +801,11 @@ $(RESLIB7TARGETN): \
     +-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.new >& $(NULLDEV)
     +-$(RM) $@ >& $(NULLDEV)
     +$(RENAME) $@.new $@
+.ENDIF          # "$(rsc_once)"!=""
 .ELSE			# "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI7) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     $(rsclang_{$(subst,$(RESLIB7NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB7NAME)$(UPD), $(@:b))}) \
@@ -657,39 +817,61 @@ $(RESLIB7TARGETN): \
     -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
     $(RSC7HEADER) $(RESLIB7SRSFILES) \
     )
+.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
-.ELSE			# "$(NO_REC_RES)"!=""
-    $(RSC) -presponse @$(mktmp \
-    $(rsclang_{$(subst,$(RESLIB7NAME)$(UPD), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB7NAME)$(UPD), $(@:b))}) \
-    -I$(RES) \
-    -fs$@ \
-    -r -p \
-    -I$(RES) \
-    -I$(PRJ)$/$(INPATH)$/res \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC7HEADER) $(RESLIB7SRSFILES) \
-    )
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ENDIF              # "$(GUI)"=="UNX"
 .ENDIF				# "$(RESLIB7TARGETN)"!=""
 
 
 # Anweisungen fuer das Linken
-#next Target
 # unroll begin
 
 .IF "$(RESLIB8TARGETN)"!=""
 
+$(RSC_MULTI8) : \
+        $(RESLIB8SRSFILES) \
+        $(RESLIB8TARGETN) \
+        $(RESLIB8BMPS)
+.IF "$(rsc_once)"!=""
+    @+echo using rsc multi-res feature
+.IF "$(common_build_reslib)"!=""
+    $(RSC) -presponse @$(mktmp \
+    -r -p \
+    $(foreach,i,$(alllangext) $(rsclang_{$i}) \
+    $(rescharset_{$i}) \
+    -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)$(UPD)$i.res} \
+    -lip{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(i)}) ) \
+    -ft$@ \
+    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
+    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    $(RSC8HEADER) $(RESLIB8SRSFILES) \
+    ) > $(NULLDEV)
+.ELSE			# "$(common_build_reslib)"!=""
+    $(RSC) -presponse @$(mktmp \
+    -r -p \
+    $(foreach,i,$(alllangext) $(rsclang_{$i}) \
+    $(rescharset_{$i}) \
+    -fs{$(BIN)$/$(RESLIB8NAME)$(UPD)$i.res} \
+    -lip{$(RES)}$/$(langext_{$(i)}) ) \
+    -ft$@ \
+    -I{$(RES)}$/$(defaultlangext) \
+    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    $(RSC8HEADER) $(RESLIB8SRSFILES) \
+    ) > $(NULLDEV)
+.ENDIF			# "$(common_build_reslib)"!=""
+.ENDIF           # "$(rsc_once)"!=""
+
 $(RESLIB8TARGETN): \
         $(RESLIB8SRSFILES) \
         $(RESLIB8BMPS)
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI8) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
-    -r \
+    -r -p \
     $(rsclang_{$(subst,$(RESLIB8NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB8NAME)$(UPD), $(@:b))}) \
     -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB8NAME)$(UPD), $(@:b))}) \
@@ -701,7 +883,11 @@ $(RESLIB8TARGETN): \
     +$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.new >& $(NULLDEV)
     +-$(RM) $@ >& $(NULLDEV)
     +$(RENAME) $@.new $@
+.ENDIF          # "$(rsc_once)"!=""
 .ELSE			# "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI8) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     -r \
     $(rsclang_{$(subst,$(RESLIB8NAME)$(UPD), $(@:b))}) \
@@ -712,22 +898,13 @@ $(RESLIB8TARGETN): \
     -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC8HEADER) $(RESLIB8SRSFILES) \
     )
+.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
-.ELSE			# "$(NO_REC_RES)"!=""
-    $(RSC) -presponse @$(mktmp \
-    -r \
-    $(rsclang_{$(subst,$(RESLIB8NAME)$(UPD), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB8NAME)$(UPD), $(@:b))}) \
-    -I$(RES) \
-    -fs$@ \
-    -I$(PRJ)$/$(INPATH)$/res \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
-    $(RSC8HEADER) $(RESLIB8SRSFILES) \
-    )
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ELSE				# "$(GUI)"=="UNX"
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI8) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     $(rsclang_{$(subst,$(RESLIB8NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB8NAME)$(UPD), $(@:b))}) \
@@ -742,7 +919,11 @@ $(RESLIB8TARGETN): \
     +-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.new >& $(NULLDEV)
     +-$(RM) $@ >& $(NULLDEV)
     +$(RENAME) $@.new $@
+.ENDIF          # "$(rsc_once)"!=""
 .ELSE			# "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI8) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     $(rsclang_{$(subst,$(RESLIB8NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB8NAME)$(UPD), $(@:b))}) \
@@ -754,39 +935,61 @@ $(RESLIB8TARGETN): \
     -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
     $(RSC8HEADER) $(RESLIB8SRSFILES) \
     )
+.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
-.ELSE			# "$(NO_REC_RES)"!=""
-    $(RSC) -presponse @$(mktmp \
-    $(rsclang_{$(subst,$(RESLIB8NAME)$(UPD), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB8NAME)$(UPD), $(@:b))}) \
-    -I$(RES) \
-    -fs$@ \
-    -r -p \
-    -I$(RES) \
-    -I$(PRJ)$/$(INPATH)$/res \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC8HEADER) $(RESLIB8SRSFILES) \
-    )
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ENDIF              # "$(GUI)"=="UNX"
 .ENDIF				# "$(RESLIB8TARGETN)"!=""
 
 
 # Anweisungen fuer das Linken
-#next Target
 # unroll begin
 
 .IF "$(RESLIB9TARGETN)"!=""
 
+$(RSC_MULTI9) : \
+        $(RESLIB9SRSFILES) \
+        $(RESLIB9TARGETN) \
+        $(RESLIB9BMPS)
+.IF "$(rsc_once)"!=""
+    @+echo using rsc multi-res feature
+.IF "$(common_build_reslib)"!=""
+    $(RSC) -presponse @$(mktmp \
+    -r -p \
+    $(foreach,i,$(alllangext) $(rsclang_{$i}) \
+    $(rescharset_{$i}) \
+    -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)$(UPD)$i.res} \
+    -lip{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(i)}) ) \
+    -ft$@ \
+    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
+    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    $(RSC9HEADER) $(RESLIB9SRSFILES) \
+    ) > $(NULLDEV)
+.ELSE			# "$(common_build_reslib)"!=""
+    $(RSC) -presponse @$(mktmp \
+    -r -p \
+    $(foreach,i,$(alllangext) $(rsclang_{$i}) \
+    $(rescharset_{$i}) \
+    -fs{$(BIN)$/$(RESLIB9NAME)$(UPD)$i.res} \
+    -lip{$(RES)}$/$(langext_{$(i)}) ) \
+    -ft$@ \
+    -I{$(RES)}$/$(defaultlangext) \
+    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    $(RSC9HEADER) $(RESLIB9SRSFILES) \
+    ) > $(NULLDEV)
+.ENDIF			# "$(common_build_reslib)"!=""
+.ENDIF           # "$(rsc_once)"!=""
+
 $(RESLIB9TARGETN): \
         $(RESLIB9SRSFILES) \
         $(RESLIB9BMPS)
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI9) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
-    -r \
+    -r -p \
     $(rsclang_{$(subst,$(RESLIB9NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB9NAME)$(UPD), $(@:b))}) \
     -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB9NAME)$(UPD), $(@:b))}) \
@@ -798,7 +1001,11 @@ $(RESLIB9TARGETN): \
     +$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.new >& $(NULLDEV)
     +-$(RM) $@ >& $(NULLDEV)
     +$(RENAME) $@.new $@
+.ENDIF          # "$(rsc_once)"!=""
 .ELSE			# "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI9) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     -r \
     $(rsclang_{$(subst,$(RESLIB9NAME)$(UPD), $(@:b))}) \
@@ -809,22 +1016,13 @@ $(RESLIB9TARGETN): \
     -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC9HEADER) $(RESLIB9SRSFILES) \
     )
+.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
-.ELSE			# "$(NO_REC_RES)"!=""
-    $(RSC) -presponse @$(mktmp \
-    -r \
-    $(rsclang_{$(subst,$(RESLIB9NAME)$(UPD), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB9NAME)$(UPD), $(@:b))}) \
-    -I$(RES) \
-    -fs$@ \
-    -I$(PRJ)$/$(INPATH)$/res \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
-    $(RSC9HEADER) $(RESLIB9SRSFILES) \
-    )
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ELSE				# "$(GUI)"=="UNX"
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI9) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     $(rsclang_{$(subst,$(RESLIB9NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB9NAME)$(UPD), $(@:b))}) \
@@ -839,7 +1037,11 @@ $(RESLIB9TARGETN): \
     +-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.new >& $(NULLDEV)
     +-$(RM) $@ >& $(NULLDEV)
     +$(RENAME) $@.new $@
+.ENDIF          # "$(rsc_once)"!=""
 .ELSE			# "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI9) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     $(rsclang_{$(subst,$(RESLIB9NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB9NAME)$(UPD), $(@:b))}) \
@@ -851,39 +1053,61 @@ $(RESLIB9TARGETN): \
     -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
     $(RSC9HEADER) $(RESLIB9SRSFILES) \
     )
+.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
-.ELSE			# "$(NO_REC_RES)"!=""
-    $(RSC) -presponse @$(mktmp \
-    $(rsclang_{$(subst,$(RESLIB9NAME)$(UPD), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB9NAME)$(UPD), $(@:b))}) \
-    -I$(RES) \
-    -fs$@ \
-    -r -p \
-    -I$(RES) \
-    -I$(PRJ)$/$(INPATH)$/res \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC9HEADER) $(RESLIB9SRSFILES) \
-    )
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ENDIF              # "$(GUI)"=="UNX"
 .ENDIF				# "$(RESLIB9TARGETN)"!=""
 
 
 # Anweisungen fuer das Linken
-#next Target
 # unroll begin
 
 .IF "$(RESLIB10TARGETN)"!=""
 
+$(RSC_MULTI10) : \
+        $(RESLIB10SRSFILES) \
+        $(RESLIB10TARGETN) \
+        $(RESLIB10BMPS)
+.IF "$(rsc_once)"!=""
+    @+echo using rsc multi-res feature
+.IF "$(common_build_reslib)"!=""
+    $(RSC) -presponse @$(mktmp \
+    -r -p \
+    $(foreach,i,$(alllangext) $(rsclang_{$i}) \
+    $(rescharset_{$i}) \
+    -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB10NAME)$(UPD)$i.res} \
+    -lip{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(i)}) ) \
+    -ft$@ \
+    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
+    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    $(RSC10HEADER) $(RESLIB10SRSFILES) \
+    ) > $(NULLDEV)
+.ELSE			# "$(common_build_reslib)"!=""
+    $(RSC) -presponse @$(mktmp \
+    -r -p \
+    $(foreach,i,$(alllangext) $(rsclang_{$i}) \
+    $(rescharset_{$i}) \
+    -fs{$(BIN)$/$(RESLIB10NAME)$(UPD)$i.res} \
+    -lip{$(RES)}$/$(langext_{$(i)}) ) \
+    -ft$@ \
+    -I{$(RES)}$/$(defaultlangext) \
+    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    $(RSC10HEADER) $(RESLIB10SRSFILES) \
+    ) > $(NULLDEV)
+.ENDIF			# "$(common_build_reslib)"!=""
+.ENDIF           # "$(rsc_once)"!=""
+
 $(RESLIB10TARGETN): \
         $(RESLIB10SRSFILES) \
         $(RESLIB10BMPS)
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI10) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
-    -r \
+    -r -p \
     $(rsclang_{$(subst,$(RESLIB10NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB10NAME)$(UPD), $(@:b))}) \
     -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB10NAME)$(UPD), $(@:b))}) \
@@ -895,7 +1119,11 @@ $(RESLIB10TARGETN): \
     +$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.new >& $(NULLDEV)
     +-$(RM) $@ >& $(NULLDEV)
     +$(RENAME) $@.new $@
+.ENDIF          # "$(rsc_once)"!=""
 .ELSE			# "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI10) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     -r \
     $(rsclang_{$(subst,$(RESLIB10NAME)$(UPD), $(@:b))}) \
@@ -906,22 +1134,13 @@ $(RESLIB10TARGETN): \
     -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC10HEADER) $(RESLIB10SRSFILES) \
     )
+.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
-.ELSE			# "$(NO_REC_RES)"!=""
-    $(RSC) -presponse @$(mktmp \
-    -r \
-    $(rsclang_{$(subst,$(RESLIB10NAME)$(UPD), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB10NAME)$(UPD), $(@:b))}) \
-    -I$(RES) \
-    -fs$@ \
-    -I$(PRJ)$/$(INPATH)$/res \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
-    $(RSC10HEADER) $(RESLIB10SRSFILES) \
-    )
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ELSE				# "$(GUI)"=="UNX"
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI10) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     $(rsclang_{$(subst,$(RESLIB10NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB10NAME)$(UPD), $(@:b))}) \
@@ -936,7 +1155,11 @@ $(RESLIB10TARGETN): \
     +-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.new >& $(NULLDEV)
     +-$(RM) $@ >& $(NULLDEV)
     +$(RENAME) $@.new $@
+.ENDIF          # "$(rsc_once)"!=""
 .ELSE			# "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI10) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     $(rsclang_{$(subst,$(RESLIB10NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB10NAME)$(UPD), $(@:b))}) \
@@ -948,23 +1171,10 @@ $(RESLIB10TARGETN): \
     -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
     $(RSC10HEADER) $(RESLIB10SRSFILES) \
     )
+.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
-.ELSE			# "$(NO_REC_RES)"!=""
-    $(RSC) -presponse @$(mktmp \
-    $(rsclang_{$(subst,$(RESLIB10NAME)$(UPD), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB10NAME)$(UPD), $(@:b))}) \
-    -I$(RES) \
-    -fs$@ \
-    -r -p \
-    -I$(RES) \
-    -I$(PRJ)$/$(INPATH)$/res \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC10HEADER) $(RESLIB10SRSFILES) \
-    )
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ENDIF              # "$(GUI)"=="UNX"
 .ENDIF				# "$(RESLIB10TARGETN)"!=""
 
 
 # Anweisungen fuer das Linken
-#next Target
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 661e6cc3efeb..a1311c7ece74 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: target.mk,v $
 #
-#   $Revision: 1.83 $
+#   $Revision: 1.84 $
 #
-#   last change: $Author: hjs $ $Date: 2001-11-05 15:30:49 $
+#   last change: $Author: hjs $ $Date: 2001-11-07 14:28:33 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -1432,9 +1432,6 @@ HXXCOPYTARGET=	copy_hxxcopyfiles
 .ENDIF
 
 .IF "$(IMGLST_SRS)"!=""
-.IF "$(NO_REC_RES)"==""
-IMGLSTTARGET=$(MISCX)$/$(TARGET)_img.don
-.ELSE
 .IF "$(make_srs_deps)"==""
 .IF "$(common_build_reslib)"!=""
 IMGLSTTARGET=$(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(TARGET)_img$i.don)
@@ -1442,7 +1439,6 @@ IMGLSTTARGET=$(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MIS
 IMGLSTTARGET=$(foreach,i,$(alllangext) $(MISC)$/$(TARGET)_img$i.don)
 .ENDIF			# "$(common_build_reslib)"!=""
 .ENDIF			# "$(make_srs_deps)"==""
-.ENDIF			# "$(NO_REC_RES)"==""
 .ENDIF			# "$(IMGLST_SRS)"!=""
 
 .IF "$(LIB1TARGET)" != ""
@@ -1504,128 +1500,110 @@ LIB9ARCHIV=
 
 .IF "$(RESLIB1NAME)" != ""
 RESLIB1 ?= TNR!:=1
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
 RESLIB1TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)$(UPD)LANGEXT.res
+RSC_MULTI1=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB1NAME)
 .ELSE			# "$(common_build_reslib)"!=""
 RESLIB1TARGETN=$(BIN)$/$(RESLIB1NAME)$(UPD)LANGEXT.res
+RSC_MULTI1=$(MISC)$/rsc_$(RESLIB1NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 RESLIB1TARGETN!:=$(foreach,i,$(alllangext) $(RESLIB1TARGETN:s/LANGEXT/$i/))
-.ELSE			# "$(NO_REC_RES)"!=""
-RESLIB1TARGETN=$(BIN)$/$(RESLIB1NAME)$(UPD)$(LANGEXT).res
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ENDIF
 
 .IF "$(RESLIB2NAME)" != ""
 RESLIB2 ?= TNR!:=2
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
 RESLIB2TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)$(UPD)LANGEXT.res
+RSC_MULTI2=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB2NAME)
 .ELSE			# "$(common_build_reslib)"!=""
 RESLIB2TARGETN=$(BIN)$/$(RESLIB2NAME)$(UPD)LANGEXT.res
+RSC_MULTI2=$(MISC)$/rsc_$(RESLIB2NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 RESLIB2TARGETN!:=$(foreach,i,$(alllangext) $(RESLIB2TARGETN:s/LANGEXT/$i/))
-.ELSE			# "$(NO_REC_RES)"!=""
-RESLIB2TARGETN=$(BIN)$/$(RESLIB2NAME)$(UPD)$(LANGEXT).res
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ENDIF
 
 .IF "$(RESLIB3NAME)" != ""
 RESLIB3 ?= TNR!:=3
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
 RESLIB3TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)$(UPD)LANGEXT.res
+RSC_MULTI3=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB3NAME)
 .ELSE			# "$(common_build_reslib)"!=""
 RESLIB3TARGETN=$(BIN)$/$(RESLIB3NAME)$(UPD)LANGEXT.res
+RSC_MULTI3=$(MISC)$/rsc_$(RESLIB3NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 RESLIB3TARGETN!:=$(foreach,i,$(alllangext) $(RESLIB3TARGETN:s/LANGEXT/$i/))
-.ELSE			# "$(NO_REC_RES)"!=""
-RESLIB3TARGETN=$(BIN)$/$(RESLIB3NAME)$(UPD)$(LANGEXT).res
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ENDIF
 
 .IF "$(RESLIB4NAME)" != ""
 RESLIB4 ?= TNR!:=4
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
 RESLIB4TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)$(UPD)LANGEXT.res
+RSC_MULTI4=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB4NAME)
 .ELSE			# "$(common_build_reslib)"!=""
 RESLIB4TARGETN=$(BIN)$/$(RESLIB4NAME)$(UPD)LANGEXT.res
+RSC_MULTI4=$(MISC)$/rsc_$(RESLIB4NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 RESLIB4TARGETN!:=$(foreach,i,$(alllangext) $(RESLIB4TARGETN:s/LANGEXT/$i/))
-.ELSE			# "$(NO_REC_RES)"!=""
-RESLIB4TARGETN=$(BIN)$/$(RESLIB4NAME)$(UPD)$(LANGEXT).res
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ENDIF
 
 .IF "$(RESLIB5NAME)" != ""
 RESLIB5 ?= TNR!:=5
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
 RESLIB5TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)$(UPD)LANGEXT.res
+RSC_MULTI5=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB5NAME)
 .ELSE			# "$(common_build_reslib)"!=""
 RESLIB5TARGETN=$(BIN)$/$(RESLIB5NAME)$(UPD)LANGEXT.res
+RSC_MULTI5=$(MISC)$/rsc_$(RESLIB5NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 RESLIB5TARGETN!:=$(foreach,i,$(alllangext) $(RESLIB5TARGETN:s/LANGEXT/$i/))
-.ELSE			# "$(NO_REC_RES)"!=""
-RESLIB5TARGETN=$(BIN)$/$(RESLIB5NAME)$(UPD)$(LANGEXT).res
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ENDIF
 
 .IF "$(RESLIB6NAME)" != ""
 RESLIB6 ?= TNR!:=6
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
 RESLIB6TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)$(UPD)LANGEXT.res
+RSC_MULTI6=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB6NAME)
 .ELSE			# "$(common_build_reslib)"!=""
 RESLIB6TARGETN=$(BIN)$/$(RESLIB6NAME)$(UPD)LANGEXT.res
+RSC_MULTI6=$(MISC)$/rsc_$(RESLIB6NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 RESLIB6TARGETN!:=$(foreach,i,$(alllangext) $(RESLIB6TARGETN:s/LANGEXT/$i/))
-.ELSE			# "$(NO_REC_RES)"!=""
-RESLIB6TARGETN=$(BIN)$/$(RESLIB6NAME)$(UPD)$(LANGEXT).res
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ENDIF
 
 .IF "$(RESLIB7NAME)" != ""
 RESLIB7 ?= TNR!:=7
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
 RESLIB7TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)$(UPD)LANGEXT.res
+RSC_MULTI7=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB7NAME)
 .ELSE			# "$(common_build_reslib)"!=""
 RESLIB7TARGETN=$(BIN)$/$(RESLIB7NAME)$(UPD)LANGEXT.res
+RSC_MULTI7=$(MISC)$/rsc_$(RESLIB7NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 RESLIB7TARGETN!:=$(foreach,i,$(alllangext) $(RESLIB7TARGETN:s/LANGEXT/$i/))
-.ELSE			# "$(NO_REC_RES)"!=""
-RESLIB7TARGETN=$(BIN)$/$(RESLIB7NAME)$(UPD)$(LANGEXT).res
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ENDIF
 
 .IF "$(RESLIB8NAME)" != ""
 RESLIB8 ?= TNR!:=8
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
 RESLIB8TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)$(UPD)LANGEXT.res
+RSC_MULTI8=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB8NAME)
 .ELSE			# "$(common_build_reslib)"!=""
 RESLIB8TARGETN=$(BIN)$/$(RESLIB8NAME)$(UPD)LANGEXT.res
+RSC_MULTI8=$(MISC)$/rsc_$(RESLIB8NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 RESLIB8TARGETN!:=$(foreach,i,$(alllangext) $(RESLIB8TARGETN:s/LANGEXT/$i/))
-.ELSE			# "$(NO_REC_RES)"!=""
-RESLIB8TARGETN=$(BIN)$/$(RESLIB8NAME)$(UPD)$(LANGEXT).res
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ENDIF
 
 .IF "$(RESLIB9NAME)" != ""
 RESLIB9 ?= TNR!:=9
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
 RESLIB9TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)$(UPD)LANGEXT.res
+RSC_MULTI9=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB9NAME)
 .ELSE			# "$(common_build_reslib)"!=""
 RESLIB9TARGETN=$(BIN)$/$(RESLIB9NAME)$(UPD)LANGEXT.res
+RSC_MULTI9=$(MISC)$/rsc_$(RESLIB9NAME)
 .ENDIF			# "$(common_build_reslib)"!=""
 RESLIB9TARGETN!:=$(foreach,i,$(alllangext) $(RESLIB9TARGETN:s/LANGEXT/$i/))
-.ELSE			# "$(NO_REC_RES)"!=""
-RESLIB9TARGETN=$(BIN)$/$(RESLIB9NAME)$(UPD)$(LANGEXT).res
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ENDIF
 
 .IF "$(INDPRESLIB1NAME)"!=""
@@ -1816,12 +1794,6 @@ ALL_JAVA_TARGETS= \
 
 # bei MAKE...DIR die gleiche Reihenfolge wie in settings.mak einhalten!
 
-.IF "$(NO_REC_RES)"==""
-.IF "$(solarlang)" != "deut"
-MAKELANGDIR=makelang.dir
-.ENDIF
-.ENDIF
-
 .IF "$(lintit)"==""
 .IF "$(L10N_framework)"!=""
 ALLTAR:	\
@@ -1858,6 +1830,15 @@ ALLTAR:	\
         $(SRC13TARGET)	$(SRC14TARGET)	$(SRC15TARGET)		\
         $(SRC16TARGET) \
         $(IMGLSTTARGET) \
+        $(RSC_MULTI1) \
+        $(RSC_MULTI2) \
+        $(RSC_MULTI3) \
+        $(RSC_MULTI4) \
+        $(RSC_MULTI5) \
+        $(RSC_MULTI6) \
+        $(RSC_MULTI7) \
+        $(RSC_MULTI8) \
+        $(RSC_MULTI9) \
         $(INDPRESLIB1TARGETN) \
         $(RESLIB1TARGETN) $(RESLIB2TARGETN) \
         $(RESLIB3TARGETN) $(RESLIB4TARGETN) \
@@ -1978,11 +1959,21 @@ ALLTAR: $(MAKELANGDIR)	$(MAKEDEMODIR)	$(MAKECOMPDIR) $(MAKEXLDIR)	\
         $(SRC13TARGET)	$(SRC14TARGET)	$(SRC15TARGET)		\
         $(SRC16TARGET) \
         $(IMGLSTTARGET) \
+        $(RSC_MULTI1) \
+        $(RSC_MULTI2) \
+        $(RSC_MULTI3) \
+        $(RSC_MULTI4) \
+        $(RSC_MULTI5) \
+        $(RSC_MULTI6) \
+        $(RSC_MULTI7) \
+        $(RSC_MULTI8) \
+        $(RSC_MULTI9) \
         $(INDPRESLIB1TARGETN) \
         $(RESLIB1TARGETN) $(RESLIB2TARGETN) \
         $(RESLIB3TARGETN) $(RESLIB4TARGETN) \
         $(RESLIB5TARGETN) $(RESLIB6TARGETN) \
         $(RESLIB7TARGETN) $(RESLIB8TARGETN) \
+        $(RESLIB9TARGETN) \
         $(RESLIBSPLIT1TARGETN) $(RESLIBSPLIT2TARGETN)\
         $(RESLIBSPLIT3TARGETN) $(RESLIBSPLIT4TARGETN)\
         $(RESLIBSPLIT5TARGETN) $(RESLIBSPLIT6TARGETN)\
@@ -2145,9 +2136,6 @@ $(IMGLSTTARGET): $(IMGLST_SRS)
     @+echo Making Imagelists:
     @+echo -----------------
     @+-$(RM) $@ >& $(NULLDEV)
-.IF "$(NO_REC_RES)"==""
-    +$(BMP) $(IMGLST_SRS) $(BMP_IN) $(BMP_OUT) $(solarlang)
-.ELSE
 .IF "$(common_build_reslib)"!=""
     @-+$(MKDIR) $(RES)$/$(langext_{$(subst,$(TARGET)_img, $(@:b))}) >& $(NULLDEV)
     @-+$(MKDIR) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))$/$(langext_{$(subst,$(TARGET)_img, $(@:b))}) >& $(NULLDEV)
@@ -2158,7 +2146,6 @@ $(IMGLSTTARGET): $(IMGLST_SRS)
     @-+$(MKDIR) $(RES)$/$(langext_{$(subst,$(TARGET)_img, $(@:b))}) >& $(NULLDEV)
     +$(BMP) $(IMGLST_SRS) $(BMP_IN) $(BMP_OUT)$/$(langext_{$(subst,$(TARGET)_img, $(@:b))}) $(lang_{$(subst,$(TARGET)_img, $(@:b))}) -f $@
 .ENDIF			# "$(common_build_reslib)"!=""
-.ENDIF
 .IF "$(BMP_WRITES_FLAG)"==""
     @+echo > $@
 .ENDIF
@@ -2282,11 +2269,13 @@ $(MISC)$/$(TARGET)_xxl_%.done : %.xxl
 # - RESLIBTARGET -
 # -------
 
+.IF "$(RESLIB1TARGETN)$(RESLIB2TARGETN)$(RESLIB3TARGETN)$(RESLIB4TARGETN)$(RESLIB5TARGETN)$(RESLIB6TARGETN)$(RESLIB7TARGETN)$(RESLIB8TARGETN)$(RESLIB9TARGETN)"!=""
 .IF "$(MK_UNROLL)"!=""
 .INCLUDE : _tg_rslb.mk
 .ELSE
 .INCLUDE : tg_rslb.mk
 .ENDIF
+.ENDIF
 
 # -------
 # - SHL -
diff --git a/solenv/inc/tg_rslb.mk b/solenv/inc/tg_rslb.mk
index c368a4508a0f..854ebf329756 100644
--- a/solenv/inc/tg_rslb.mk
+++ b/solenv/inc/tg_rslb.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: tg_rslb.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: mh $ $Date: 2001-06-20 09:09:38 $
+#   last change: $Author: hjs $ $Date: 2001-11-07 14:28:33 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -102,15 +102,50 @@ RESLIB1 RESLIB2 RESLIB3 RESLIB4 RESLIB5 RESLIB6 RESLIB7 RESLIB8 RESLIB9:
 
 .IF "$(RESLIB$(TNR)TARGETN)"!=""
 
+$(RSC_MULTI$(TNR)) : \
+        $(RESLIB$(TNR)SRSFILES) \
+        $(RESLIB$(TNR)TARGETN) \
+        $(RESLIB$(TNR)BMPS)
+.IF "$(rsc_once)"!=""
+    @+echo using rsc multi-res feature
+.IF "$(common_build_reslib)"!=""
+    $(RSC) -presponse @$(mktmp \
+    -r -p \
+    $(foreach,i,$(alllangext) $(rsclang_{$i}) \
+    $(rescharset_{$i}) \
+    -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB$(TNR)NAME)$(UPD)$i.res} \
+    -lip{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(i)}) ) \
+    -ft$@ \
+    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
+    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    $(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \
+    ) > $(NULLDEV)
+.ELSE			# "$(common_build_reslib)"!=""
+    $(RSC) -presponse @$(mktmp \
+    -r -p \
+    $(foreach,i,$(alllangext) $(rsclang_{$i}) \
+    $(rescharset_{$i}) \
+    -fs{$(BIN)$/$(RESLIB$(TNR)NAME)$(UPD)$i.res} \
+    -lip{$(RES)}$/$(langext_{$(i)}) ) \
+    -ft$@ \
+    -I{$(RES)}$/$(defaultlangext) \
+    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    $(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \
+    ) > $(NULLDEV)
+.ENDIF			# "$(common_build_reslib)"!=""
+.ENDIF           # "$(rsc_once)"!=""
+
 $(RESLIB$(TNR)TARGETN): \
         $(RESLIB$(TNR)SRSFILES) \
         $(RESLIB$(TNR)BMPS)
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI$(TNR)) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
-    -r \
+    -r -p \
     $(rsclang_{$(subst,$(RESLIB$(TNR)NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB$(TNR)NAME)$(UPD), $(@:b))}) \
     -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB$(TNR)NAME)$(UPD), $(@:b))}) \
@@ -122,7 +157,11 @@ $(RESLIB$(TNR)TARGETN): \
     +$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.new >& $(NULLDEV)
     +-$(RM) $@ >& $(NULLDEV)
     +$(RENAME) $@.new $@
+.ENDIF          # "$(rsc_once)"!=""
 .ELSE			# "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI$(TNR)) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     -r \
     $(rsclang_{$(subst,$(RESLIB$(TNR)NAME)$(UPD), $(@:b))}) \
@@ -133,22 +172,13 @@ $(RESLIB$(TNR)TARGETN): \
     -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \
     )
+.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
-.ELSE			# "$(NO_REC_RES)"!=""
-    $(RSC) -presponse @$(mktmp \
-    -r \
-    $(rsclang_{$(subst,$(RESLIB$(TNR)NAME)$(UPD), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB$(TNR)NAME)$(UPD), $(@:b))}) \
-    -I$(RES) \
-    -fs$@ \
-    -I$(PRJ)$/$(INPATH)$/res \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
-    $(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \
-    )
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ELSE				# "$(GUI)"=="UNX"
-.IF "$(NO_REC_RES)"!=""
 .IF "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI$(TNR)) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     $(rsclang_{$(subst,$(RESLIB$(TNR)NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB$(TNR)NAME)$(UPD), $(@:b))}) \
@@ -163,7 +193,11 @@ $(RESLIB$(TNR)TARGETN): \
     +-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.new >& $(NULLDEV)
     +-$(RM) $@ >& $(NULLDEV)
     +$(RENAME) $@.new $@
+.ENDIF          # "$(rsc_once)"!=""
 .ELSE			# "$(common_build_reslib)"!=""
+.IF "$(rsc_once)"!=""
+    @+-$(RM) $(RSC_MULTI$(TNR)) >& $(NULLDEV)
+.ELSE           # "$(rsc_once)"!=""
     $(RSC) -presponse @$(mktmp \
     $(rsclang_{$(subst,$(RESLIB$(TNR)NAME)$(UPD), $(@:b))}) \
     $(rescharset_{$(subst,$(RESLIB$(TNR)NAME)$(UPD), $(@:b))}) \
@@ -175,20 +209,8 @@ $(RESLIB$(TNR)TARGETN): \
     -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
     $(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \
     )
+.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
-.ELSE			# "$(NO_REC_RES)"!=""
-    $(RSC) -presponse @$(mktmp \
-    $(rsclang_{$(subst,$(RESLIB$(TNR)NAME)$(UPD), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB$(TNR)NAME)$(UPD), $(@:b))}) \
-    -I$(RES) \
-    -fs$@ \
-    -r -p \
-    -I$(RES) \
-    -I$(PRJ)$/$(INPATH)$/res \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \
-    )
-.ENDIF			# "$(NO_REC_RES)"!=""
 .ENDIF              # "$(GUI)"=="UNX"
 .ENDIF				# "$(RESLIB$(TNR)TARGETN)"!=""