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

INTEGRATION: CWS sb71 (1.106.32); FILE MERGED

Browse source 
2007/07/18 11:58:01 sb 1.106.32.2: RESYNC: (1.106-1.109); FILE MERGED
2007/06/14 15:09:31 sb 1.106.32.1: #i75466# Replaced LINKFLAGSRUNPATH with more flexible APP|SHLnRPATH.
This commit is contained in:
Vladimir Glazounov 2007-10-15 11:39:01 +00:00
parent 42e699b3f1
commit bad42d0220
1 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
solenv/inc/_tg_shl.mk
View file

@ -24,6 +24,10 @@ SHL1STDSHL=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDSHL))
SHL1LINKFLAGS+=$(LINKFLAGS)
.ENDIF # "$(SHL1CODETYPE)"=="C"
SHL1RPATH*=OOO
LINKFLAGSRUNPATH_$(SHL1RPATH)*=/ERROR:/Bad_SHL1RPATH_value
SHL1LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL1RPATH))
.IF "$(SHL1USE_EXPORTS)"==""
SHL1DEF*=$(MISC)$/$(SHL1TARGET).def
.ENDIF # "$(SHL1USE_EXPORTS)"==""
@ -464,6 +468,10 @@ SHL2STDSHL=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDSHL))
SHL2LINKFLAGS+=$(LINKFLAGS)
.ENDIF # "$(SHL2CODETYPE)"=="C"
SHL2RPATH*=OOO
LINKFLAGSRUNPATH_$(SHL2RPATH)*=/ERROR:/Bad_SHL2RPATH_value
SHL2LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL2RPATH))
.IF "$(SHL2USE_EXPORTS)"==""
SHL2DEF*=$(MISC)$/$(SHL2TARGET).def
.ENDIF # "$(SHL2USE_EXPORTS)"==""
@ -904,6 +912,10 @@ SHL3STDSHL=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDSHL))
SHL3LINKFLAGS+=$(LINKFLAGS)
.ENDIF # "$(SHL3CODETYPE)"=="C"
SHL3RPATH*=OOO
LINKFLAGSRUNPATH_$(SHL3RPATH)*=/ERROR:/Bad_SHL3RPATH_value
SHL3LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL3RPATH))
.IF "$(SHL3USE_EXPORTS)"==""
SHL3DEF*=$(MISC)$/$(SHL3TARGET).def
.ENDIF # "$(SHL3USE_EXPORTS)"==""
@ -1344,6 +1356,10 @@ SHL4STDSHL=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDSHL))
SHL4LINKFLAGS+=$(LINKFLAGS)
.ENDIF # "$(SHL4CODETYPE)"=="C"
SHL4RPATH*=OOO
LINKFLAGSRUNPATH_$(SHL4RPATH)*=/ERROR:/Bad_SHL4RPATH_value
SHL4LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL4RPATH))
.IF "$(SHL4USE_EXPORTS)"==""
SHL4DEF*=$(MISC)$/$(SHL4TARGET).def
.ENDIF # "$(SHL4USE_EXPORTS)"==""
@ -1784,6 +1800,10 @@ SHL5STDSHL=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDSHL))
SHL5LINKFLAGS+=$(LINKFLAGS)
.ENDIF # "$(SHL5CODETYPE)"=="C"
SHL5RPATH*=OOO
LINKFLAGSRUNPATH_$(SHL5RPATH)*=/ERROR:/Bad_SHL5RPATH_value
SHL5LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL5RPATH))
.IF "$(SHL5USE_EXPORTS)"==""
SHL5DEF*=$(MISC)$/$(SHL5TARGET).def
.ENDIF # "$(SHL5USE_EXPORTS)"==""
@ -2224,6 +2244,10 @@ SHL6STDSHL=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDSHL))
SHL6LINKFLAGS+=$(LINKFLAGS)
.ENDIF # "$(SHL6CODETYPE)"=="C"
SHL6RPATH*=OOO
LINKFLAGSRUNPATH_$(SHL6RPATH)*=/ERROR:/Bad_SHL6RPATH_value
SHL6LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL6RPATH))
.IF "$(SHL6USE_EXPORTS)"==""
SHL6DEF*=$(MISC)$/$(SHL6TARGET).def
.ENDIF # "$(SHL6USE_EXPORTS)"==""
@ -2664,6 +2688,10 @@ SHL7STDSHL=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDSHL))
SHL7LINKFLAGS+=$(LINKFLAGS)
.ENDIF # "$(SHL7CODETYPE)"=="C"
SHL7RPATH*=OOO
LINKFLAGSRUNPATH_$(SHL7RPATH)*=/ERROR:/Bad_SHL7RPATH_value
SHL7LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL7RPATH))
.IF "$(SHL7USE_EXPORTS)"==""
SHL7DEF*=$(MISC)$/$(SHL7TARGET).def
.ENDIF # "$(SHL7USE_EXPORTS)"==""
@ -3104,6 +3132,10 @@ SHL8STDSHL=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDSHL))
SHL8LINKFLAGS+=$(LINKFLAGS)
.ENDIF # "$(SHL8CODETYPE)"=="C"
SHL8RPATH*=OOO
LINKFLAGSRUNPATH_$(SHL8RPATH)*=/ERROR:/Bad_SHL8RPATH_value
SHL8LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL8RPATH))
.IF "$(SHL8USE_EXPORTS)"==""
SHL8DEF*=$(MISC)$/$(SHL8TARGET).def
.ENDIF # "$(SHL8USE_EXPORTS)"==""
@ -3544,6 +3576,10 @@ SHL9STDSHL=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDSHL))
SHL9LINKFLAGS+=$(LINKFLAGS)
.ENDIF # "$(SHL9CODETYPE)"=="C"
SHL9RPATH*=OOO
LINKFLAGSRUNPATH_$(SHL9RPATH)*=/ERROR:/Bad_SHL9RPATH_value
SHL9LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL9RPATH))
.IF "$(SHL9USE_EXPORTS)"==""
SHL9DEF*=$(MISC)$/$(SHL9TARGET).def
.ENDIF # "$(SHL9USE_EXPORTS)"==""
@ -3984,6 +4020,10 @@ SHL10STDSHL=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDSHL))
SHL10LINKFLAGS+=$(LINKFLAGS)
.ENDIF # "$(SHL10CODETYPE)"=="C"
SHL10RPATH*=OOO
LINKFLAGSRUNPATH_$(SHL10RPATH)*=/ERROR:/Bad_SHL10RPATH_value
SHL10LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL10RPATH))
.IF "$(SHL10USE_EXPORTS)"==""
SHL10DEF*=$(MISC)$/$(SHL10TARGET).def
.ENDIF # "$(SHL10USE_EXPORTS)"==""