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

revert this

Browse source
This commit is contained in:
Caolán McNamara 2011-02-22 13:33:30 +00:00
parent 23adf2f0d6
commit 4dd4885566
2 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
solenv/inc/_tg_rslb.mk
View file

@ -25,7 +25,7 @@ $(RSC_MULTI1) : \
@echo Compiling: $(@:f) @echo Compiling: $(@:f)
.IF "$(common_build_reslib)"!="" .IF "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \ $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-p \ -r -p \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB1NAME)$i.res} \ -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB1NAME)$i.res} \
@ -40,7 +40,7 @@ $(RSC_MULTI1) : \
) > $(NULLDEV) ) > $(NULLDEV)
.ELSE # "$(common_build_reslib)"!="" .ELSE # "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \ $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-p \ -r -p \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB1NAME)$i.res} \ -fs={$(BIN)/$(RESLIB1NAME)$i.res} \
@ -102,7 +102,7 @@ $(RSC_MULTI2) : \
@echo Compiling: $(@:f) @echo Compiling: $(@:f)
.IF "$(common_build_reslib)"!="" .IF "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \ $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-p \ -r -p \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB2NAME)$i.res} \ -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB2NAME)$i.res} \
@ -117,7 +117,7 @@ $(RSC_MULTI2) : \
) > $(NULLDEV) ) > $(NULLDEV)
.ELSE # "$(common_build_reslib)"!="" .ELSE # "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \ $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-p \ -r -p \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB2NAME)$i.res} \ -fs={$(BIN)/$(RESLIB2NAME)$i.res} \
@ -179,7 +179,7 @@ $(RSC_MULTI3) : \
@echo Compiling: $(@:f) @echo Compiling: $(@:f)
.IF "$(common_build_reslib)"!="" .IF "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \ $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-p \ -r -p \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB3NAME)$i.res} \ -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB3NAME)$i.res} \
@ -194,7 +194,7 @@ $(RSC_MULTI3) : \
) > $(NULLDEV) ) > $(NULLDEV)
.ELSE # "$(common_build_reslib)"!="" .ELSE # "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \ $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-p \ -r -p \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB3NAME)$i.res} \ -fs={$(BIN)/$(RESLIB3NAME)$i.res} \
@ -256,7 +256,7 @@ $(RSC_MULTI4) : \
@echo Compiling: $(@:f) @echo Compiling: $(@:f)
.IF "$(common_build_reslib)"!="" .IF "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \ $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-p \ -r -p \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB4NAME)$i.res} \ -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB4NAME)$i.res} \
@ -271,7 +271,7 @@ $(RSC_MULTI4) : \
) > $(NULLDEV) ) > $(NULLDEV)
.ELSE # "$(common_build_reslib)"!="" .ELSE # "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \ $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-p \ -r -p \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB4NAME)$i.res} \ -fs={$(BIN)/$(RESLIB4NAME)$i.res} \
@ -333,7 +333,7 @@ $(RSC_MULTI5) : \
@echo Compiling: $(@:f) @echo Compiling: $(@:f)
.IF "$(common_build_reslib)"!="" .IF "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \ $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-p \ -r -p \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB5NAME)$i.res} \ -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB5NAME)$i.res} \
@ -348,7 +348,7 @@ $(RSC_MULTI5) : \
) > $(NULLDEV) ) > $(NULLDEV)
.ELSE # "$(common_build_reslib)"!="" .ELSE # "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \ $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-p \ -r -p \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB5NAME)$i.res} \ -fs={$(BIN)/$(RESLIB5NAME)$i.res} \
@ -410,7 +410,7 @@ $(RSC_MULTI6) : \
@echo Compiling: $(@:f) @echo Compiling: $(@:f)
.IF "$(common_build_reslib)"!="" .IF "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \ $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-p \ -r -p \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB6NAME)$i.res} \ -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB6NAME)$i.res} \
@ -425,7 +425,7 @@ $(RSC_MULTI6) : \
) > $(NULLDEV) ) > $(NULLDEV)
.ELSE # "$(common_build_reslib)"!="" .ELSE # "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \ $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-p \ -r -p \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB6NAME)$i.res} \ -fs={$(BIN)/$(RESLIB6NAME)$i.res} \
@ -487,7 +487,7 @@ $(RSC_MULTI7) : \
@echo Compiling: $(@:f) @echo Compiling: $(@:f)
.IF "$(common_build_reslib)"!="" .IF "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \ $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-p \ -r -p \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB7NAME)$i.res} \ -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB7NAME)$i.res} \
@ -502,7 +502,7 @@ $(RSC_MULTI7) : \
) > $(NULLDEV) ) > $(NULLDEV)
.ELSE # "$(common_build_reslib)"!="" .ELSE # "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \ $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-p \ -r -p \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB7NAME)$i.res} \ -fs={$(BIN)/$(RESLIB7NAME)$i.res} \
@ -564,7 +564,7 @@ $(RSC_MULTI8) : \
@echo Compiling: $(@:f) @echo Compiling: $(@:f)
.IF "$(common_build_reslib)"!="" .IF "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \ $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-p \ -r -p \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB8NAME)$i.res} \ -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB8NAME)$i.res} \
@ -579,7 +579,7 @@ $(RSC_MULTI8) : \
) > $(NULLDEV) ) > $(NULLDEV)
.ELSE # "$(common_build_reslib)"!="" .ELSE # "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \ $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-p \ -r -p \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB8NAME)$i.res} \ -fs={$(BIN)/$(RESLIB8NAME)$i.res} \
@ -641,7 +641,7 @@ $(RSC_MULTI9) : \
@echo Compiling: $(@:f) @echo Compiling: $(@:f)
.IF "$(common_build_reslib)"!="" .IF "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \ $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-p \ -r -p \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB9NAME)$i.res} \ -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB9NAME)$i.res} \
@ -656,7 +656,7 @@ $(RSC_MULTI9) : \
) > $(NULLDEV) ) > $(NULLDEV)
.ELSE # "$(common_build_reslib)"!="" .ELSE # "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \ $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-p \ -r -p \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB9NAME)$i.res} \ -fs={$(BIN)/$(RESLIB9NAME)$i.res} \
@ -718,7 +718,7 @@ $(RSC_MULTI10) : \
@echo Compiling: $(@:f) @echo Compiling: $(@:f)
.IF "$(common_build_reslib)"!="" .IF "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \ $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-p \ -r -p \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB10NAME)$i.res} \ -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB10NAME)$i.res} \
@ -733,7 +733,7 @@ $(RSC_MULTI10) : \
) > $(NULLDEV) ) > $(NULLDEV)
.ELSE # "$(common_build_reslib)"!="" .ELSE # "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \ $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-p \ -r -p \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB10NAME)$i.res} \ -fs={$(BIN)/$(RESLIB10NAME)$i.res} \

4
solenv/inc/tg_rslb.mk
View file

@ -53,7 +53,7 @@ $(RSC_MULTI$(TNR)) : \
@echo Compiling: $(@:f) @echo Compiling: $(@:f)
.IF "$(common_build_reslib)"!="" .IF "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \ $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-p \ -r -p \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB$(TNR)NAME)$i.res} \ -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB$(TNR)NAME)$i.res} \
@ -68,7 +68,7 @@ $(RSC_MULTI$(TNR)) : \
) > $(NULLDEV) ) > $(NULLDEV)
.ELSE # "$(common_build_reslib)"!="" .ELSE # "$(common_build_reslib)"!=""
$(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \ $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-p \ -r -p \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB$(TNR)NAME)$i.res} \ -fs={$(BIN)/$(RESLIB$(TNR)NAME)$i.res} \