INTEGRATION: CWS bmpres01 (1.4.98); FILE MERGED

2004/05/04 15:10:50 hjs 1.4.98.2: #i22149# replace command for 4nt
2004/05/03 12:37:49 hjs 1.4.98.1: #i22149# required switches for new image handling

1 files changed, 370 insertions, 680 deletions

diff --git a/solenv/inc/_tg_rslb.mk b/solenv/inc/_tg_rslb.mk
index 8891aaf8b319..17ea60e07518 100644
--- a/solenv/inc/_tg_rslb.mk
+++ b/solenv/inc/_tg_rslb.mk
@@ -19,11 +19,31 @@ ALLTAR : $(HIDRES1PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
+.IF "$(common_build_reslib)"!=""
+$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)$(RESLIB1VERSION).ilst2 : $(RSC_MULTI1)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)$(RESLIB1VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)$(RESLIB1VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)$(RESLIB1VERSION).ilst2
+.ELSE           # "$(common_build_reslib)"!=""
+$(BIN)$/$(RESLIB1NAME)$(RESLIB1VERSION).ilst2 : $(RSC_MULTI1)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB1NAME)$(RESLIB1VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)$(RESLIB1VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(BIN)$/$(RESLIB1NAME)$(RESLIB1VERSION).ilst2
+.ENDIF          # "$(common_build_reslib)"!=""
+
+
 $(RSC_MULTI1) : \
         $(RESLIB1SRSFILES) \
         $(RESLIB1TARGETN) \
         $(RESLIB1BMPS)
-.IF "$(rsc_once)"!=""
     @+echo using rsc multi-res feature
 .IF "$(common_build_reslib)"!=""
     $(RSC) -presponse @$(mktmp \
@@ -31,10 +51,15 @@ $(RSC_MULTI1) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)$(RESLIB1VERSION)$i.res} \
-    -lip{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(i)}) ) \
+    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    -lip{$j} ) \
+    -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
+    -subMODULE=$(PRJ) \
+    -subGLOBAL=$(SOLARSRC) \
+    -subCUSTOM=to_be_defined \
+    -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -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) \
+    -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC1HEADER) $(RESLIB1SRSFILES) \
     ) > $(NULLDEV)
 .ELSE			# "$(common_build_reslib)"!=""
@@ -43,14 +68,18 @@ $(RSC_MULTI1) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(BIN)$/$(RESLIB1NAME)$(RESLIB1VERSION)$i.res} \
-    -lip{$(RES)}$/$(langext_{$(i)}) ) \
+    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    -lip{$j} ) \
+    -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
+    -subGLOBAL=$(SOLARSRC) \
+    -subMODULE=$(PRJ) \
+    -subCUSTOM=to_be_defined \
+    -oil$(BIN) \
     -ft$@ \
-    -I{$(RES)}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC1HEADER) $(RESLIB1SRSFILES) \
     ) > $(NULLDEV)
 .ENDIF			# "$(common_build_reslib)"!=""
-.ENDIF           # "$(rsc_once)"!=""
 
 $(RESLIB1TARGETN): \
         $(RESLIB1SRSFILES) \
@@ -58,75 +87,15 @@ $(RESLIB1TARGETN): \
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
-.IF "$(rsc_once)"!=""
     @+-$(RM) $(RSC_MULTI1) >& $(NULLDEV)
-.ELSE           # "$(rsc_once)"!=""
-    $(RSC) -presponse @$(mktmp \
-    -r -p \
-    $(rsclang_{$(subst,$(RESLIB1NAME)$(RESLIB1VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB1NAME)$(RESLIB1VERSION), $(@:b))}) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB1NAME)$(RESLIB1VERSION), $(@:b))}) \
-    -fs{$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)} \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
-    $(RSC1HEADER) $(RESLIB1SRSFILES) \
-    )
-    +$(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)$(RESLIB1VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB1NAME)$(RESLIB1VERSION), $(@:b))}) \
-    -I$(RES)$/$(langext_{$(subst,$(RESLIB1NAME)$(RESLIB1VERSION), $(@:b))}) \
-    -fs$@ \
-    -I$(PRJ)$/$(INPATH)$/res$/$(defaultlangext) \
-    -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				# "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
-.IF "$(rsc_once)"!=""
     @+-$(RM) $(RSC_MULTI1) >& $(NULLDEV)
-.ELSE           # "$(rsc_once)"!=""
-    $(RSC) -presponse @$(mktmp \
-    $(rsclang_{$(subst,$(RESLIB1NAME)$(RESLIB1VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB1NAME)$(RESLIB1VERSION), $(@:b))}) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB1NAME)$(RESLIB1VERSION), $(@:b))}) \
-    -fs{$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)} \
-    -r -p \
-    -I$(RES) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC1HEADER) $(RESLIB1SRSFILES) \
-    )
-    +-$(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)$(RESLIB1VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB1NAME)$(RESLIB1VERSION), $(@:b))}) \
-    -I$(RES)$/$(langext_{$(subst,$(RESLIB1NAME)$(RESLIB1VERSION), $(@:b))}) \
-    -fs$@ \
-    -r -p \
-    -I$(RES) \
-    -I$(PRJ)$/$(INPATH)$/res$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC1HEADER) $(RESLIB1SRSFILES) \
-    )
-.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
 .ENDIF              # "$(GUI)"=="UNX"
 .ENDIF				# "$(RESLIB1TARGETN)"!=""
@@ -154,11 +123,31 @@ ALLTAR : $(HIDRES2PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
+.IF "$(common_build_reslib)"!=""
+$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)$(RESLIB2VERSION).ilst2 : $(RSC_MULTI2)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)$(RESLIB2VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)$(RESLIB2VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)$(RESLIB2VERSION).ilst2
+.ELSE           # "$(common_build_reslib)"!=""
+$(BIN)$/$(RESLIB2NAME)$(RESLIB2VERSION).ilst2 : $(RSC_MULTI2)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB2NAME)$(RESLIB2VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)$(RESLIB2VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(BIN)$/$(RESLIB2NAME)$(RESLIB2VERSION).ilst2
+.ENDIF          # "$(common_build_reslib)"!=""
+
+
 $(RSC_MULTI2) : \
         $(RESLIB2SRSFILES) \
         $(RESLIB2TARGETN) \
         $(RESLIB2BMPS)
-.IF "$(rsc_once)"!=""
     @+echo using rsc multi-res feature
 .IF "$(common_build_reslib)"!=""
     $(RSC) -presponse @$(mktmp \
@@ -166,10 +155,15 @@ $(RSC_MULTI2) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)$(RESLIB2VERSION)$i.res} \
-    -lip{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(i)}) ) \
+    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    -lip{$j} ) \
+    -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
+    -subMODULE=$(PRJ) \
+    -subGLOBAL=$(SOLARSRC) \
+    -subCUSTOM=to_be_defined \
+    -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -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) \
+    -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC2HEADER) $(RESLIB2SRSFILES) \
     ) > $(NULLDEV)
 .ELSE			# "$(common_build_reslib)"!=""
@@ -178,14 +172,18 @@ $(RSC_MULTI2) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(BIN)$/$(RESLIB2NAME)$(RESLIB2VERSION)$i.res} \
-    -lip{$(RES)}$/$(langext_{$(i)}) ) \
+    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    -lip{$j} ) \
+    -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
+    -subGLOBAL=$(SOLARSRC) \
+    -subMODULE=$(PRJ) \
+    -subCUSTOM=to_be_defined \
+    -oil$(BIN) \
     -ft$@ \
-    -I{$(RES)}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC2HEADER) $(RESLIB2SRSFILES) \
     ) > $(NULLDEV)
 .ENDIF			# "$(common_build_reslib)"!=""
-.ENDIF           # "$(rsc_once)"!=""
 
 $(RESLIB2TARGETN): \
         $(RESLIB2SRSFILES) \
@@ -193,75 +191,15 @@ $(RESLIB2TARGETN): \
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
-.IF "$(rsc_once)"!=""
     @+-$(RM) $(RSC_MULTI2) >& $(NULLDEV)
-.ELSE           # "$(rsc_once)"!=""
-    $(RSC) -presponse @$(mktmp \
-    -r -p \
-    $(rsclang_{$(subst,$(RESLIB2NAME)$(RESLIB2VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB2NAME)$(RESLIB2VERSION), $(@:b))}) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB2NAME)$(RESLIB2VERSION), $(@:b))}) \
-    -fs{$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)} \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
-    $(RSC2HEADER) $(RESLIB2SRSFILES) \
-    )
-    +$(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)$(RESLIB2VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB2NAME)$(RESLIB2VERSION), $(@:b))}) \
-    -I$(RES)$/$(langext_{$(subst,$(RESLIB2NAME)$(RESLIB2VERSION), $(@:b))}) \
-    -fs$@ \
-    -I$(PRJ)$/$(INPATH)$/res$/$(defaultlangext) \
-    -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				# "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
-.IF "$(rsc_once)"!=""
     @+-$(RM) $(RSC_MULTI2) >& $(NULLDEV)
-.ELSE           # "$(rsc_once)"!=""
-    $(RSC) -presponse @$(mktmp \
-    $(rsclang_{$(subst,$(RESLIB2NAME)$(RESLIB2VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB2NAME)$(RESLIB2VERSION), $(@:b))}) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB2NAME)$(RESLIB2VERSION), $(@:b))}) \
-    -fs{$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)} \
-    -r -p \
-    -I$(RES) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC2HEADER) $(RESLIB2SRSFILES) \
-    )
-    +-$(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)$(RESLIB2VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB2NAME)$(RESLIB2VERSION), $(@:b))}) \
-    -I$(RES)$/$(langext_{$(subst,$(RESLIB2NAME)$(RESLIB2VERSION), $(@:b))}) \
-    -fs$@ \
-    -r -p \
-    -I$(RES) \
-    -I$(PRJ)$/$(INPATH)$/res$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC2HEADER) $(RESLIB2SRSFILES) \
-    )
-.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
 .ENDIF              # "$(GUI)"=="UNX"
 .ENDIF				# "$(RESLIB2TARGETN)"!=""
@@ -289,11 +227,31 @@ ALLTAR : $(HIDRES3PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
+.IF "$(common_build_reslib)"!=""
+$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)$(RESLIB3VERSION).ilst2 : $(RSC_MULTI3)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)$(RESLIB3VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)$(RESLIB3VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)$(RESLIB3VERSION).ilst2
+.ELSE           # "$(common_build_reslib)"!=""
+$(BIN)$/$(RESLIB3NAME)$(RESLIB3VERSION).ilst2 : $(RSC_MULTI3)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB3NAME)$(RESLIB3VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)$(RESLIB3VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(BIN)$/$(RESLIB3NAME)$(RESLIB3VERSION).ilst2
+.ENDIF          # "$(common_build_reslib)"!=""
+
+
 $(RSC_MULTI3) : \
         $(RESLIB3SRSFILES) \
         $(RESLIB3TARGETN) \
         $(RESLIB3BMPS)
-.IF "$(rsc_once)"!=""
     @+echo using rsc multi-res feature
 .IF "$(common_build_reslib)"!=""
     $(RSC) -presponse @$(mktmp \
@@ -301,10 +259,15 @@ $(RSC_MULTI3) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)$(RESLIB3VERSION)$i.res} \
-    -lip{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(i)}) ) \
+    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    -lip{$j} ) \
+    -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
+    -subMODULE=$(PRJ) \
+    -subGLOBAL=$(SOLARSRC) \
+    -subCUSTOM=to_be_defined \
+    -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -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) \
+    -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC3HEADER) $(RESLIB3SRSFILES) \
     ) > $(NULLDEV)
 .ELSE			# "$(common_build_reslib)"!=""
@@ -313,14 +276,18 @@ $(RSC_MULTI3) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(BIN)$/$(RESLIB3NAME)$(RESLIB3VERSION)$i.res} \
-    -lip{$(RES)}$/$(langext_{$(i)}) ) \
+    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    -lip{$j} ) \
+    -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
+    -subGLOBAL=$(SOLARSRC) \
+    -subMODULE=$(PRJ) \
+    -subCUSTOM=to_be_defined \
+    -oil$(BIN) \
     -ft$@ \
-    -I{$(RES)}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC3HEADER) $(RESLIB3SRSFILES) \
     ) > $(NULLDEV)
 .ENDIF			# "$(common_build_reslib)"!=""
-.ENDIF           # "$(rsc_once)"!=""
 
 $(RESLIB3TARGETN): \
         $(RESLIB3SRSFILES) \
@@ -328,75 +295,15 @@ $(RESLIB3TARGETN): \
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
-.IF "$(rsc_once)"!=""
     @+-$(RM) $(RSC_MULTI3) >& $(NULLDEV)
-.ELSE           # "$(rsc_once)"!=""
-    $(RSC) -presponse @$(mktmp \
-    -r -p \
-    $(rsclang_{$(subst,$(RESLIB3NAME)$(RESLIB3VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB3NAME)$(RESLIB3VERSION), $(@:b))}) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB3NAME)$(RESLIB3VERSION), $(@:b))}) \
-    -fs{$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)} \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
-    $(RSC3HEADER) $(RESLIB3SRSFILES) \
-    )
-    +$(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)$(RESLIB3VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB3NAME)$(RESLIB3VERSION), $(@:b))}) \
-    -I$(RES)$/$(langext_{$(subst,$(RESLIB3NAME)$(RESLIB3VERSION), $(@:b))}) \
-    -fs$@ \
-    -I$(PRJ)$/$(INPATH)$/res$/$(defaultlangext) \
-    -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				# "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
-.IF "$(rsc_once)"!=""
     @+-$(RM) $(RSC_MULTI3) >& $(NULLDEV)
-.ELSE           # "$(rsc_once)"!=""
-    $(RSC) -presponse @$(mktmp \
-    $(rsclang_{$(subst,$(RESLIB3NAME)$(RESLIB3VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB3NAME)$(RESLIB3VERSION), $(@:b))}) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB3NAME)$(RESLIB3VERSION), $(@:b))}) \
-    -fs{$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)} \
-    -r -p \
-    -I$(RES) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC3HEADER) $(RESLIB3SRSFILES) \
-    )
-    +-$(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)$(RESLIB3VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB3NAME)$(RESLIB3VERSION), $(@:b))}) \
-    -I$(RES)$/$(langext_{$(subst,$(RESLIB3NAME)$(RESLIB3VERSION), $(@:b))}) \
-    -fs$@ \
-    -r -p \
-    -I$(RES) \
-    -I$(PRJ)$/$(INPATH)$/res$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC3HEADER) $(RESLIB3SRSFILES) \
-    )
-.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
 .ENDIF              # "$(GUI)"=="UNX"
 .ENDIF				# "$(RESLIB3TARGETN)"!=""
@@ -424,11 +331,31 @@ ALLTAR : $(HIDRES4PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
+.IF "$(common_build_reslib)"!=""
+$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)$(RESLIB4VERSION).ilst2 : $(RSC_MULTI4)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)$(RESLIB4VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)$(RESLIB4VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)$(RESLIB4VERSION).ilst2
+.ELSE           # "$(common_build_reslib)"!=""
+$(BIN)$/$(RESLIB4NAME)$(RESLIB4VERSION).ilst2 : $(RSC_MULTI4)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB4NAME)$(RESLIB4VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)$(RESLIB4VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(BIN)$/$(RESLIB4NAME)$(RESLIB4VERSION).ilst2
+.ENDIF          # "$(common_build_reslib)"!=""
+
+
 $(RSC_MULTI4) : \
         $(RESLIB4SRSFILES) \
         $(RESLIB4TARGETN) \
         $(RESLIB4BMPS)
-.IF "$(rsc_once)"!=""
     @+echo using rsc multi-res feature
 .IF "$(common_build_reslib)"!=""
     $(RSC) -presponse @$(mktmp \
@@ -436,10 +363,15 @@ $(RSC_MULTI4) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)$(RESLIB4VERSION)$i.res} \
-    -lip{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(i)}) ) \
+    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    -lip{$j} ) \
+    -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
+    -subMODULE=$(PRJ) \
+    -subGLOBAL=$(SOLARSRC) \
+    -subCUSTOM=to_be_defined \
+    -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -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) \
+    -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC4HEADER) $(RESLIB4SRSFILES) \
     ) > $(NULLDEV)
 .ELSE			# "$(common_build_reslib)"!=""
@@ -448,14 +380,18 @@ $(RSC_MULTI4) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(BIN)$/$(RESLIB4NAME)$(RESLIB4VERSION)$i.res} \
-    -lip{$(RES)}$/$(langext_{$(i)}) ) \
+    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    -lip{$j} ) \
+    -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
+    -subGLOBAL=$(SOLARSRC) \
+    -subMODULE=$(PRJ) \
+    -subCUSTOM=to_be_defined \
+    -oil$(BIN) \
     -ft$@ \
-    -I{$(RES)}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC4HEADER) $(RESLIB4SRSFILES) \
     ) > $(NULLDEV)
 .ENDIF			# "$(common_build_reslib)"!=""
-.ENDIF           # "$(rsc_once)"!=""
 
 $(RESLIB4TARGETN): \
         $(RESLIB4SRSFILES) \
@@ -463,75 +399,15 @@ $(RESLIB4TARGETN): \
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
-.IF "$(rsc_once)"!=""
     @+-$(RM) $(RSC_MULTI4) >& $(NULLDEV)
-.ELSE           # "$(rsc_once)"!=""
-    $(RSC) -presponse @$(mktmp \
-    -r -p \
-    $(rsclang_{$(subst,$(RESLIB4NAME)$(RESLIB4VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB4NAME)$(RESLIB4VERSION), $(@:b))}) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB4NAME)$(RESLIB4VERSION), $(@:b))}) \
-    -fs{$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)} \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
-    $(RSC4HEADER) $(RESLIB4SRSFILES) \
-    )
-    +$(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)$(RESLIB4VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB4NAME)$(RESLIB4VERSION), $(@:b))}) \
-    -I$(RES)$/$(langext_{$(subst,$(RESLIB4NAME)$(RESLIB4VERSION), $(@:b))}) \
-    -fs$@ \
-    -I$(PRJ)$/$(INPATH)$/res$/$(defaultlangext) \
-    -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				# "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
-.IF "$(rsc_once)"!=""
     @+-$(RM) $(RSC_MULTI4) >& $(NULLDEV)
-.ELSE           # "$(rsc_once)"!=""
-    $(RSC) -presponse @$(mktmp \
-    $(rsclang_{$(subst,$(RESLIB4NAME)$(RESLIB4VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB4NAME)$(RESLIB4VERSION), $(@:b))}) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB4NAME)$(RESLIB4VERSION), $(@:b))}) \
-    -fs{$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)} \
-    -r -p \
-    -I$(RES) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC4HEADER) $(RESLIB4SRSFILES) \
-    )
-    +-$(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)$(RESLIB4VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB4NAME)$(RESLIB4VERSION), $(@:b))}) \
-    -I$(RES)$/$(langext_{$(subst,$(RESLIB4NAME)$(RESLIB4VERSION), $(@:b))}) \
-    -fs$@ \
-    -r -p \
-    -I$(RES) \
-    -I$(PRJ)$/$(INPATH)$/res$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC4HEADER) $(RESLIB4SRSFILES) \
-    )
-.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
 .ENDIF              # "$(GUI)"=="UNX"
 .ENDIF				# "$(RESLIB4TARGETN)"!=""
@@ -559,11 +435,31 @@ ALLTAR : $(HIDRES5PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
+.IF "$(common_build_reslib)"!=""
+$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)$(RESLIB5VERSION).ilst2 : $(RSC_MULTI5)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)$(RESLIB5VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)$(RESLIB5VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)$(RESLIB5VERSION).ilst2
+.ELSE           # "$(common_build_reslib)"!=""
+$(BIN)$/$(RESLIB5NAME)$(RESLIB5VERSION).ilst2 : $(RSC_MULTI5)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB5NAME)$(RESLIB5VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)$(RESLIB5VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(BIN)$/$(RESLIB5NAME)$(RESLIB5VERSION).ilst2
+.ENDIF          # "$(common_build_reslib)"!=""
+
+
 $(RSC_MULTI5) : \
         $(RESLIB5SRSFILES) \
         $(RESLIB5TARGETN) \
         $(RESLIB5BMPS)
-.IF "$(rsc_once)"!=""
     @+echo using rsc multi-res feature
 .IF "$(common_build_reslib)"!=""
     $(RSC) -presponse @$(mktmp \
@@ -571,10 +467,15 @@ $(RSC_MULTI5) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)$(RESLIB5VERSION)$i.res} \
-    -lip{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(i)}) ) \
+    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    -lip{$j} ) \
+    -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
+    -subMODULE=$(PRJ) \
+    -subGLOBAL=$(SOLARSRC) \
+    -subCUSTOM=to_be_defined \
+    -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -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) \
+    -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC5HEADER) $(RESLIB5SRSFILES) \
     ) > $(NULLDEV)
 .ELSE			# "$(common_build_reslib)"!=""
@@ -583,14 +484,18 @@ $(RSC_MULTI5) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(BIN)$/$(RESLIB5NAME)$(RESLIB5VERSION)$i.res} \
-    -lip{$(RES)}$/$(langext_{$(i)}) ) \
+    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    -lip{$j} ) \
+    -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
+    -subGLOBAL=$(SOLARSRC) \
+    -subMODULE=$(PRJ) \
+    -subCUSTOM=to_be_defined \
+    -oil$(BIN) \
     -ft$@ \
-    -I{$(RES)}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC5HEADER) $(RESLIB5SRSFILES) \
     ) > $(NULLDEV)
 .ENDIF			# "$(common_build_reslib)"!=""
-.ENDIF           # "$(rsc_once)"!=""
 
 $(RESLIB5TARGETN): \
         $(RESLIB5SRSFILES) \
@@ -598,75 +503,15 @@ $(RESLIB5TARGETN): \
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
-.IF "$(rsc_once)"!=""
     @+-$(RM) $(RSC_MULTI5) >& $(NULLDEV)
-.ELSE           # "$(rsc_once)"!=""
-    $(RSC) -presponse @$(mktmp \
-    -r -p \
-    $(rsclang_{$(subst,$(RESLIB5NAME)$(RESLIB5VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB5NAME)$(RESLIB5VERSION), $(@:b))}) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB5NAME)$(RESLIB5VERSION), $(@:b))}) \
-    -fs{$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)} \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
-    $(RSC5HEADER) $(RESLIB5SRSFILES) \
-    )
-    +$(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)$(RESLIB5VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB5NAME)$(RESLIB5VERSION), $(@:b))}) \
-    -I$(RES)$/$(langext_{$(subst,$(RESLIB5NAME)$(RESLIB5VERSION), $(@:b))}) \
-    -fs$@ \
-    -I$(PRJ)$/$(INPATH)$/res$/$(defaultlangext) \
-    -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				# "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
-.IF "$(rsc_once)"!=""
     @+-$(RM) $(RSC_MULTI5) >& $(NULLDEV)
-.ELSE           # "$(rsc_once)"!=""
-    $(RSC) -presponse @$(mktmp \
-    $(rsclang_{$(subst,$(RESLIB5NAME)$(RESLIB5VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB5NAME)$(RESLIB5VERSION), $(@:b))}) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB5NAME)$(RESLIB5VERSION), $(@:b))}) \
-    -fs{$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)} \
-    -r -p \
-    -I$(RES) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC5HEADER) $(RESLIB5SRSFILES) \
-    )
-    +-$(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)$(RESLIB5VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB5NAME)$(RESLIB5VERSION), $(@:b))}) \
-    -I$(RES)$/$(langext_{$(subst,$(RESLIB5NAME)$(RESLIB5VERSION), $(@:b))}) \
-    -fs$@ \
-    -r -p \
-    -I$(RES) \
-    -I$(PRJ)$/$(INPATH)$/res$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC5HEADER) $(RESLIB5SRSFILES) \
-    )
-.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
 .ENDIF              # "$(GUI)"=="UNX"
 .ENDIF				# "$(RESLIB5TARGETN)"!=""
@@ -694,11 +539,31 @@ ALLTAR : $(HIDRES6PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
+.IF "$(common_build_reslib)"!=""
+$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)$(RESLIB6VERSION).ilst2 : $(RSC_MULTI6)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)$(RESLIB6VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)$(RESLIB6VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)$(RESLIB6VERSION).ilst2
+.ELSE           # "$(common_build_reslib)"!=""
+$(BIN)$/$(RESLIB6NAME)$(RESLIB6VERSION).ilst2 : $(RSC_MULTI6)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB6NAME)$(RESLIB6VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)$(RESLIB6VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(BIN)$/$(RESLIB6NAME)$(RESLIB6VERSION).ilst2
+.ENDIF          # "$(common_build_reslib)"!=""
+
+
 $(RSC_MULTI6) : \
         $(RESLIB6SRSFILES) \
         $(RESLIB6TARGETN) \
         $(RESLIB6BMPS)
-.IF "$(rsc_once)"!=""
     @+echo using rsc multi-res feature
 .IF "$(common_build_reslib)"!=""
     $(RSC) -presponse @$(mktmp \
@@ -706,10 +571,15 @@ $(RSC_MULTI6) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)$(RESLIB6VERSION)$i.res} \
-    -lip{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(i)}) ) \
+    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    -lip{$j} ) \
+    -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
+    -subMODULE=$(PRJ) \
+    -subGLOBAL=$(SOLARSRC) \
+    -subCUSTOM=to_be_defined \
+    -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -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) \
+    -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC6HEADER) $(RESLIB6SRSFILES) \
     ) > $(NULLDEV)
 .ELSE			# "$(common_build_reslib)"!=""
@@ -718,14 +588,18 @@ $(RSC_MULTI6) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(BIN)$/$(RESLIB6NAME)$(RESLIB6VERSION)$i.res} \
-    -lip{$(RES)}$/$(langext_{$(i)}) ) \
+    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    -lip{$j} ) \
+    -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
+    -subGLOBAL=$(SOLARSRC) \
+    -subMODULE=$(PRJ) \
+    -subCUSTOM=to_be_defined \
+    -oil$(BIN) \
     -ft$@ \
-    -I{$(RES)}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC6HEADER) $(RESLIB6SRSFILES) \
     ) > $(NULLDEV)
 .ENDIF			# "$(common_build_reslib)"!=""
-.ENDIF           # "$(rsc_once)"!=""
 
 $(RESLIB6TARGETN): \
         $(RESLIB6SRSFILES) \
@@ -733,75 +607,15 @@ $(RESLIB6TARGETN): \
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
-.IF "$(rsc_once)"!=""
     @+-$(RM) $(RSC_MULTI6) >& $(NULLDEV)
-.ELSE           # "$(rsc_once)"!=""
-    $(RSC) -presponse @$(mktmp \
-    -r -p \
-    $(rsclang_{$(subst,$(RESLIB6NAME)$(RESLIB6VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB6NAME)$(RESLIB6VERSION), $(@:b))}) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB6NAME)$(RESLIB6VERSION), $(@:b))}) \
-    -fs{$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)} \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
-    $(RSC6HEADER) $(RESLIB6SRSFILES) \
-    )
-    +$(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)$(RESLIB6VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB6NAME)$(RESLIB6VERSION), $(@:b))}) \
-    -I$(RES)$/$(langext_{$(subst,$(RESLIB6NAME)$(RESLIB6VERSION), $(@:b))}) \
-    -fs$@ \
-    -I$(PRJ)$/$(INPATH)$/res$/$(defaultlangext) \
-    -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				# "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
-.IF "$(rsc_once)"!=""
     @+-$(RM) $(RSC_MULTI6) >& $(NULLDEV)
-.ELSE           # "$(rsc_once)"!=""
-    $(RSC) -presponse @$(mktmp \
-    $(rsclang_{$(subst,$(RESLIB6NAME)$(RESLIB6VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB6NAME)$(RESLIB6VERSION), $(@:b))}) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB6NAME)$(RESLIB6VERSION), $(@:b))}) \
-    -fs{$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)} \
-    -r -p \
-    -I$(RES) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC6HEADER) $(RESLIB6SRSFILES) \
-    )
-    +-$(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)$(RESLIB6VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB6NAME)$(RESLIB6VERSION), $(@:b))}) \
-    -I$(RES)$/$(langext_{$(subst,$(RESLIB6NAME)$(RESLIB6VERSION), $(@:b))}) \
-    -fs$@ \
-    -r -p \
-    -I$(RES) \
-    -I$(PRJ)$/$(INPATH)$/res$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC6HEADER) $(RESLIB6SRSFILES) \
-    )
-.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
 .ENDIF              # "$(GUI)"=="UNX"
 .ENDIF				# "$(RESLIB6TARGETN)"!=""
@@ -829,11 +643,31 @@ ALLTAR : $(HIDRES7PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
+.IF "$(common_build_reslib)"!=""
+$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)$(RESLIB7VERSION).ilst2 : $(RSC_MULTI7)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)$(RESLIB7VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)$(RESLIB7VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)$(RESLIB7VERSION).ilst2
+.ELSE           # "$(common_build_reslib)"!=""
+$(BIN)$/$(RESLIB7NAME)$(RESLIB7VERSION).ilst2 : $(RSC_MULTI7)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB7NAME)$(RESLIB7VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)$(RESLIB7VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(BIN)$/$(RESLIB7NAME)$(RESLIB7VERSION).ilst2
+.ENDIF          # "$(common_build_reslib)"!=""
+
+
 $(RSC_MULTI7) : \
         $(RESLIB7SRSFILES) \
         $(RESLIB7TARGETN) \
         $(RESLIB7BMPS)
-.IF "$(rsc_once)"!=""
     @+echo using rsc multi-res feature
 .IF "$(common_build_reslib)"!=""
     $(RSC) -presponse @$(mktmp \
@@ -841,10 +675,15 @@ $(RSC_MULTI7) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)$(RESLIB7VERSION)$i.res} \
-    -lip{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(i)}) ) \
+    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    -lip{$j} ) \
+    -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
+    -subMODULE=$(PRJ) \
+    -subGLOBAL=$(SOLARSRC) \
+    -subCUSTOM=to_be_defined \
+    -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -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) \
+    -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC7HEADER) $(RESLIB7SRSFILES) \
     ) > $(NULLDEV)
 .ELSE			# "$(common_build_reslib)"!=""
@@ -853,14 +692,18 @@ $(RSC_MULTI7) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(BIN)$/$(RESLIB7NAME)$(RESLIB7VERSION)$i.res} \
-    -lip{$(RES)}$/$(langext_{$(i)}) ) \
+    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    -lip{$j} ) \
+    -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
+    -subGLOBAL=$(SOLARSRC) \
+    -subMODULE=$(PRJ) \
+    -subCUSTOM=to_be_defined \
+    -oil$(BIN) \
     -ft$@ \
-    -I{$(RES)}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC7HEADER) $(RESLIB7SRSFILES) \
     ) > $(NULLDEV)
 .ENDIF			# "$(common_build_reslib)"!=""
-.ENDIF           # "$(rsc_once)"!=""
 
 $(RESLIB7TARGETN): \
         $(RESLIB7SRSFILES) \
@@ -868,75 +711,15 @@ $(RESLIB7TARGETN): \
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
-.IF "$(rsc_once)"!=""
     @+-$(RM) $(RSC_MULTI7) >& $(NULLDEV)
-.ELSE           # "$(rsc_once)"!=""
-    $(RSC) -presponse @$(mktmp \
-    -r -p \
-    $(rsclang_{$(subst,$(RESLIB7NAME)$(RESLIB7VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB7NAME)$(RESLIB7VERSION), $(@:b))}) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB7NAME)$(RESLIB7VERSION), $(@:b))}) \
-    -fs{$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)} \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
-    $(RSC7HEADER) $(RESLIB7SRSFILES) \
-    )
-    +$(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)$(RESLIB7VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB7NAME)$(RESLIB7VERSION), $(@:b))}) \
-    -I$(RES)$/$(langext_{$(subst,$(RESLIB7NAME)$(RESLIB7VERSION), $(@:b))}) \
-    -fs$@ \
-    -I$(PRJ)$/$(INPATH)$/res$/$(defaultlangext) \
-    -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				# "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
-.IF "$(rsc_once)"!=""
     @+-$(RM) $(RSC_MULTI7) >& $(NULLDEV)
-.ELSE           # "$(rsc_once)"!=""
-    $(RSC) -presponse @$(mktmp \
-    $(rsclang_{$(subst,$(RESLIB7NAME)$(RESLIB7VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB7NAME)$(RESLIB7VERSION), $(@:b))}) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB7NAME)$(RESLIB7VERSION), $(@:b))}) \
-    -fs{$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)} \
-    -r -p \
-    -I$(RES) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC7HEADER) $(RESLIB7SRSFILES) \
-    )
-    +-$(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)$(RESLIB7VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB7NAME)$(RESLIB7VERSION), $(@:b))}) \
-    -I$(RES)$/$(langext_{$(subst,$(RESLIB7NAME)$(RESLIB7VERSION), $(@:b))}) \
-    -fs$@ \
-    -r -p \
-    -I$(RES) \
-    -I$(PRJ)$/$(INPATH)$/res$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC7HEADER) $(RESLIB7SRSFILES) \
-    )
-.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
 .ENDIF              # "$(GUI)"=="UNX"
 .ENDIF				# "$(RESLIB7TARGETN)"!=""
@@ -964,11 +747,31 @@ ALLTAR : $(HIDRES8PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
+.IF "$(common_build_reslib)"!=""
+$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)$(RESLIB8VERSION).ilst2 : $(RSC_MULTI8)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)$(RESLIB8VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)$(RESLIB8VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)$(RESLIB8VERSION).ilst2
+.ELSE           # "$(common_build_reslib)"!=""
+$(BIN)$/$(RESLIB8NAME)$(RESLIB8VERSION).ilst2 : $(RSC_MULTI8)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB8NAME)$(RESLIB8VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)$(RESLIB8VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(BIN)$/$(RESLIB8NAME)$(RESLIB8VERSION).ilst2
+.ENDIF          # "$(common_build_reslib)"!=""
+
+
 $(RSC_MULTI8) : \
         $(RESLIB8SRSFILES) \
         $(RESLIB8TARGETN) \
         $(RESLIB8BMPS)
-.IF "$(rsc_once)"!=""
     @+echo using rsc multi-res feature
 .IF "$(common_build_reslib)"!=""
     $(RSC) -presponse @$(mktmp \
@@ -976,10 +779,15 @@ $(RSC_MULTI8) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)$(RESLIB8VERSION)$i.res} \
-    -lip{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(i)}) ) \
+    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    -lip{$j} ) \
+    -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
+    -subMODULE=$(PRJ) \
+    -subGLOBAL=$(SOLARSRC) \
+    -subCUSTOM=to_be_defined \
+    -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -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) \
+    -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC8HEADER) $(RESLIB8SRSFILES) \
     ) > $(NULLDEV)
 .ELSE			# "$(common_build_reslib)"!=""
@@ -988,14 +796,18 @@ $(RSC_MULTI8) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(BIN)$/$(RESLIB8NAME)$(RESLIB8VERSION)$i.res} \
-    -lip{$(RES)}$/$(langext_{$(i)}) ) \
+    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    -lip{$j} ) \
+    -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
+    -subGLOBAL=$(SOLARSRC) \
+    -subMODULE=$(PRJ) \
+    -subCUSTOM=to_be_defined \
+    -oil$(BIN) \
     -ft$@ \
-    -I{$(RES)}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC8HEADER) $(RESLIB8SRSFILES) \
     ) > $(NULLDEV)
 .ENDIF			# "$(common_build_reslib)"!=""
-.ENDIF           # "$(rsc_once)"!=""
 
 $(RESLIB8TARGETN): \
         $(RESLIB8SRSFILES) \
@@ -1003,75 +815,15 @@ $(RESLIB8TARGETN): \
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
-.IF "$(rsc_once)"!=""
     @+-$(RM) $(RSC_MULTI8) >& $(NULLDEV)
-.ELSE           # "$(rsc_once)"!=""
-    $(RSC) -presponse @$(mktmp \
-    -r -p \
-    $(rsclang_{$(subst,$(RESLIB8NAME)$(RESLIB8VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB8NAME)$(RESLIB8VERSION), $(@:b))}) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB8NAME)$(RESLIB8VERSION), $(@:b))}) \
-    -fs{$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)} \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
-    $(RSC8HEADER) $(RESLIB8SRSFILES) \
-    )
-    +$(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)$(RESLIB8VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB8NAME)$(RESLIB8VERSION), $(@:b))}) \
-    -I$(RES)$/$(langext_{$(subst,$(RESLIB8NAME)$(RESLIB8VERSION), $(@:b))}) \
-    -fs$@ \
-    -I$(PRJ)$/$(INPATH)$/res$/$(defaultlangext) \
-    -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				# "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
-.IF "$(rsc_once)"!=""
     @+-$(RM) $(RSC_MULTI8) >& $(NULLDEV)
-.ELSE           # "$(rsc_once)"!=""
-    $(RSC) -presponse @$(mktmp \
-    $(rsclang_{$(subst,$(RESLIB8NAME)$(RESLIB8VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB8NAME)$(RESLIB8VERSION), $(@:b))}) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB8NAME)$(RESLIB8VERSION), $(@:b))}) \
-    -fs{$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)} \
-    -r -p \
-    -I$(RES) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC8HEADER) $(RESLIB8SRSFILES) \
-    )
-    +-$(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)$(RESLIB8VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB8NAME)$(RESLIB8VERSION), $(@:b))}) \
-    -I$(RES)$/$(langext_{$(subst,$(RESLIB8NAME)$(RESLIB8VERSION), $(@:b))}) \
-    -fs$@ \
-    -r -p \
-    -I$(RES) \
-    -I$(PRJ)$/$(INPATH)$/res$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC8HEADER) $(RESLIB8SRSFILES) \
-    )
-.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
 .ENDIF              # "$(GUI)"=="UNX"
 .ENDIF				# "$(RESLIB8TARGETN)"!=""
@@ -1099,11 +851,31 @@ ALLTAR : $(HIDRES9PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
+.IF "$(common_build_reslib)"!=""
+$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)$(RESLIB9VERSION).ilst2 : $(RSC_MULTI9)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)$(RESLIB9VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)$(RESLIB9VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)$(RESLIB9VERSION).ilst2
+.ELSE           # "$(common_build_reslib)"!=""
+$(BIN)$/$(RESLIB9NAME)$(RESLIB9VERSION).ilst2 : $(RSC_MULTI9)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB9NAME)$(RESLIB9VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)$(RESLIB9VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(BIN)$/$(RESLIB9NAME)$(RESLIB9VERSION).ilst2
+.ENDIF          # "$(common_build_reslib)"!=""
+
+
 $(RSC_MULTI9) : \
         $(RESLIB9SRSFILES) \
         $(RESLIB9TARGETN) \
         $(RESLIB9BMPS)
-.IF "$(rsc_once)"!=""
     @+echo using rsc multi-res feature
 .IF "$(common_build_reslib)"!=""
     $(RSC) -presponse @$(mktmp \
@@ -1111,10 +883,15 @@ $(RSC_MULTI9) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)$(RESLIB9VERSION)$i.res} \
-    -lip{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(i)}) ) \
+    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    -lip{$j} ) \
+    -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
+    -subMODULE=$(PRJ) \
+    -subGLOBAL=$(SOLARSRC) \
+    -subCUSTOM=to_be_defined \
+    -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -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) \
+    -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC9HEADER) $(RESLIB9SRSFILES) \
     ) > $(NULLDEV)
 .ELSE			# "$(common_build_reslib)"!=""
@@ -1123,14 +900,18 @@ $(RSC_MULTI9) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(BIN)$/$(RESLIB9NAME)$(RESLIB9VERSION)$i.res} \
-    -lip{$(RES)}$/$(langext_{$(i)}) ) \
+    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    -lip{$j} ) \
+    -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
+    -subGLOBAL=$(SOLARSRC) \
+    -subMODULE=$(PRJ) \
+    -subCUSTOM=to_be_defined \
+    -oil$(BIN) \
     -ft$@ \
-    -I{$(RES)}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC9HEADER) $(RESLIB9SRSFILES) \
     ) > $(NULLDEV)
 .ENDIF			# "$(common_build_reslib)"!=""
-.ENDIF           # "$(rsc_once)"!=""
 
 $(RESLIB9TARGETN): \
         $(RESLIB9SRSFILES) \
@@ -1138,75 +919,15 @@ $(RESLIB9TARGETN): \
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
-.IF "$(rsc_once)"!=""
     @+-$(RM) $(RSC_MULTI9) >& $(NULLDEV)
-.ELSE           # "$(rsc_once)"!=""
-    $(RSC) -presponse @$(mktmp \
-    -r -p \
-    $(rsclang_{$(subst,$(RESLIB9NAME)$(RESLIB9VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB9NAME)$(RESLIB9VERSION), $(@:b))}) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB9NAME)$(RESLIB9VERSION), $(@:b))}) \
-    -fs{$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)} \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
-    $(RSC9HEADER) $(RESLIB9SRSFILES) \
-    )
-    +$(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)$(RESLIB9VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB9NAME)$(RESLIB9VERSION), $(@:b))}) \
-    -I$(RES)$/$(langext_{$(subst,$(RESLIB9NAME)$(RESLIB9VERSION), $(@:b))}) \
-    -fs$@ \
-    -I$(PRJ)$/$(INPATH)$/res$/$(defaultlangext) \
-    -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				# "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
-.IF "$(rsc_once)"!=""
     @+-$(RM) $(RSC_MULTI9) >& $(NULLDEV)
-.ELSE           # "$(rsc_once)"!=""
-    $(RSC) -presponse @$(mktmp \
-    $(rsclang_{$(subst,$(RESLIB9NAME)$(RESLIB9VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB9NAME)$(RESLIB9VERSION), $(@:b))}) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB9NAME)$(RESLIB9VERSION), $(@:b))}) \
-    -fs{$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)} \
-    -r -p \
-    -I$(RES) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC9HEADER) $(RESLIB9SRSFILES) \
-    )
-    +-$(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)$(RESLIB9VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB9NAME)$(RESLIB9VERSION), $(@:b))}) \
-    -I$(RES)$/$(langext_{$(subst,$(RESLIB9NAME)$(RESLIB9VERSION), $(@:b))}) \
-    -fs$@ \
-    -r -p \
-    -I$(RES) \
-    -I$(PRJ)$/$(INPATH)$/res$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC9HEADER) $(RESLIB9SRSFILES) \
-    )
-.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
 .ENDIF              # "$(GUI)"=="UNX"
 .ENDIF				# "$(RESLIB9TARGETN)"!=""
@@ -1234,11 +955,31 @@ ALLTAR : $(HIDRES10PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
+.IF "$(common_build_reslib)"!=""
+$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB10NAME)$(RESLIB10VERSION).ilst2 : $(RSC_MULTI10)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB10NAME)$(RESLIB10VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB10NAME)$(RESLIB10VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB10NAME)$(RESLIB10VERSION).ilst2
+.ELSE           # "$(common_build_reslib)"!=""
+$(BIN)$/$(RESLIB10NAME)$(RESLIB10VERSION).ilst2 : $(RSC_MULTI10)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB10NAME)$(RESLIB10VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB10NAME)$(RESLIB10VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(BIN)$/$(RESLIB10NAME)$(RESLIB10VERSION).ilst2
+.ENDIF          # "$(common_build_reslib)"!=""
+
+
 $(RSC_MULTI10) : \
         $(RESLIB10SRSFILES) \
         $(RESLIB10TARGETN) \
         $(RESLIB10BMPS)
-.IF "$(rsc_once)"!=""
     @+echo using rsc multi-res feature
 .IF "$(common_build_reslib)"!=""
     $(RSC) -presponse @$(mktmp \
@@ -1246,10 +987,15 @@ $(RSC_MULTI10) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB10NAME)$(RESLIB10VERSION)$i.res} \
-    -lip{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(i)}) ) \
+    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    -lip{$j} ) \
+    -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
+    -subMODULE=$(PRJ) \
+    -subGLOBAL=$(SOLARSRC) \
+    -subCUSTOM=to_be_defined \
+    -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
     -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) \
+    -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC10HEADER) $(RESLIB10SRSFILES) \
     ) > $(NULLDEV)
 .ELSE			# "$(common_build_reslib)"!=""
@@ -1258,14 +1004,18 @@ $(RSC_MULTI10) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(BIN)$/$(RESLIB10NAME)$(RESLIB10VERSION)$i.res} \
-    -lip{$(RES)}$/$(langext_{$(i)}) ) \
+    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    -lip{$j} ) \
+    -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
+    -subGLOBAL=$(SOLARSRC) \
+    -subMODULE=$(PRJ) \
+    -subCUSTOM=to_be_defined \
+    -oil$(BIN) \
     -ft$@ \
-    -I{$(RES)}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
+    -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
     $(RSC10HEADER) $(RESLIB10SRSFILES) \
     ) > $(NULLDEV)
 .ENDIF			# "$(common_build_reslib)"!=""
-.ENDIF           # "$(rsc_once)"!=""
 
 $(RESLIB10TARGETN): \
         $(RESLIB10SRSFILES) \
@@ -1273,75 +1023,15 @@ $(RESLIB10TARGETN): \
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
-.IF "$(rsc_once)"!=""
     @+-$(RM) $(RSC_MULTI10) >& $(NULLDEV)
-.ELSE           # "$(rsc_once)"!=""
-    $(RSC) -presponse @$(mktmp \
-    -r -p \
-    $(rsclang_{$(subst,$(RESLIB10NAME)$(RESLIB10VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB10NAME)$(RESLIB10VERSION), $(@:b))}) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB10NAME)$(RESLIB10VERSION), $(@:b))}) \
-    -fs{$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)} \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(PRJ)$/win$/res -I$(PRJ)$/..$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INC) $(SOLARINC) \
-    $(RSC10HEADER) $(RESLIB10SRSFILES) \
-    )
-    +$(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)$(RESLIB10VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB10NAME)$(RESLIB10VERSION), $(@:b))}) \
-    -I$(RES)$/$(langext_{$(subst,$(RESLIB10NAME)$(RESLIB10VERSION), $(@:b))}) \
-    -fs$@ \
-    -I$(PRJ)$/$(INPATH)$/res$/$(defaultlangext) \
-    -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				# "$(GUI)"=="UNX"
 .IF "$(common_build_reslib)"!=""
-.IF "$(rsc_once)"!=""
     @+-$(RM) $(RSC_MULTI10) >& $(NULLDEV)
-.ELSE           # "$(rsc_once)"!=""
-    $(RSC) -presponse @$(mktmp \
-    $(rsclang_{$(subst,$(RESLIB10NAME)$(RESLIB10VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB10NAME)$(RESLIB10VERSION), $(@:b))}) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(langext_{$(subst,$(RESLIB10NAME)$(RESLIB10VERSION), $(@:b))}) \
-    -fs{$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)} \
-    -r -p \
-    -I$(RES) \
-    -I{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(RES))}$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC10HEADER) $(RESLIB10SRSFILES) \
-    )
-    +-$(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)$(RESLIB10VERSION), $(@:b))}) \
-    $(rescharset_{$(subst,$(RESLIB10NAME)$(RESLIB10VERSION), $(@:b))}) \
-    -I$(RES)$/$(langext_{$(subst,$(RESLIB10NAME)$(RESLIB10VERSION), $(@:b))}) \
-    -fs$@ \
-    -r -p \
-    -I$(RES) \
-    -I$(PRJ)$/$(INPATH)$/res$/$(defaultlangext) \
-    -I$(PRJ)$/$(GUIBASE)$/res -I$(PRJ)$/res -I$(RSCLOCINC) -I$(RSCGLOINC) -I$(INCLUDE) \
-    $(RSC10HEADER) $(RESLIB10SRSFILES) \
-    )
-.ENDIF          # "$(rsc_once)"!=""
 .ENDIF			# "$(common_build_reslib)"!=""
 .ENDIF              # "$(GUI)"=="UNX"
 .ENDIF				# "$(RESLIB10TARGETN)"!=""