#i118923# OS/2 port, add CPPULIB to resolve uno constructors.

filter/source/graphicfilter/eras/makefile.mk

@@ -44,6 +44,9 @@ SLOFILES =	$(SLO)$/eras.obj
 SHL1TARGET= 	era$(DLLPOSTFIX)
 SHL1IMPLIB= 	eras
 SHL1STDLIBS=	$(VCLLIB) $(TOOLSLIB) $(SALLIB) $(SVTOOLLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+=   $(CPPULIB)
+.ENDIF
 SHL1LIBS=		$(SLB)$/eras.lib
 
 .IF "$(GUI)" != "UNX"

filter/source/graphicfilter/etiff/makefile.mk

@@ -44,6 +44,9 @@ SLOFILES =	$(SLO)$/etiff.obj
 SHL1TARGET= 	eti$(DLLPOSTFIX)
 SHL1IMPLIB= 	etiff
 SHL1STDLIBS=	$(VCLLIB) $(TOOLSLIB) $(SALLIB) $(SVTOOLLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+=   $(CPPULIB)
+.ENDIF
 SHL1LIBS=		$(SLB)$/etiff.lib
 
 .IF "$(GUI)" != "UNX"

filter/source/graphicfilter/expm/makefile.mk

@@ -45,6 +45,9 @@ SLOFILES =	$(SLO)$/expm.obj
 SHL1TARGET= 	exp$(DLLPOSTFIX)
 SHL1IMPLIB= 	expm
 SHL1STDLIBS=	$(VCLLIB) $(TOOLSLIB) $(SALLIB) $(SVTOOLLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+=   $(CPPULIB)
+.ENDIF
 SHL1LIBS=		$(SLB)$/expm.lib
 
 .IF "$(GUI)" != "UNX"

filter/source/graphicfilter/idxf/makefile.mk

@@ -55,6 +55,9 @@ SLOFILES =  $(SLO)$/dxfgrprd.obj \
 SHL1TARGET=     idx$(DLLPOSTFIX)
 SHL1IMPLIB=     idxf
 SHL1STDLIBS=    $(VCLLIB) $(TOOLSLIB) $(SALLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+=   $(CPPULIB)
+.ENDIF
 
 SHL1LIBS=       $(SLB)$/idxf.lib # $(LB)$/rtftoken.lib
 

filter/source/graphicfilter/ieps/makefile.mk

@@ -44,6 +44,9 @@ SLOFILES =  $(SLO)$/ieps.obj
 SHL1TARGET=     ips$(DLLPOSTFIX)
 SHL1IMPLIB=     ieps
 SHL1STDLIBS=    $(VCLLIB) $(TOOLSLIB) $(SALLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+=   $(CPPULIB)
+.ENDIF
 SHL1LIBS=       $(SLB)$/ieps.lib
 
 .IF "$(GUI)" != "UNX"

filter/source/graphicfilter/ios2met/makefile.mk

@@ -44,6 +44,9 @@ SLOFILES =  $(SLO)$/ios2met.obj
 SHL1TARGET=     ime$(DLLPOSTFIX)
 SHL1IMPLIB=     ios2met
 SHL1STDLIBS=    $(VCLLIB) $(TOOLSLIB) $(SALLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+=   $(CPPULIB)
+.ENDIF
 
 SHL1LIBS=       $(SLB)$/ios2met.lib # $(LB)$/rtftoken.lib
 

filter/source/graphicfilter/ipbm/makefile.mk

@@ -44,6 +44,9 @@ SLOFILES =	$(SLO)$/ipbm.obj
 SHL1TARGET= 	ipb$(DLLPOSTFIX)
 SHL1IMPLIB= 	ipbm
 SHL1STDLIBS=	$(VCLLIB) $(TOOLSLIB) $(SALLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+=   $(CPPULIB)
+.ENDIF
 SHL1LIBS=		$(SLB)$/ipbm.lib
 
 .IF "$(GUI)" != "UNX"

filter/source/graphicfilter/ipcd/makefile.mk

@@ -44,6 +44,9 @@ SLOFILES =  $(SLO)$/ipcd.obj
 SHL1TARGET=     icd$(DLLPOSTFIX)
 SHL1IMPLIB=     ipcd
 SHL1STDLIBS=    $(SVTOOLLIB) $(VCLLIB) $(TOOLSLIB) $(SALLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+=   $(CPPULIB)
+.ENDIF
 SHL1LIBS=       $(SLB)$/ipcd.lib # $(LB)$/rtftoken.lib
 
 .IF "$(GUI)" != "UNX"

filter/source/graphicfilter/ipcx/makefile.mk

@@ -44,6 +44,9 @@ SLOFILES =  $(SLO)$/ipcx.obj
 SHL1TARGET=     ipx$(DLLPOSTFIX)
 SHL1IMPLIB=     ipcx
 SHL1STDLIBS=    $(VCLLIB) $(TOOLSLIB) $(SALLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+=   $(CPPULIB)
+.ENDIF
 SHL1LIBS=       $(SLB)$/ipcx.lib
 
 .IF "$(GUI)" != "UNX"

filter/source/graphicfilter/ipict/makefile.mk

@@ -44,6 +44,9 @@ SLOFILES =  $(SLO)$/ipict.obj $(SLO)$/shape.obj
 SHL1TARGET=     ipt$(DLLPOSTFIX)
 SHL1IMPLIB=     ipict
 SHL1STDLIBS=    $(VCLLIB) $(TOOLSLIB) $(SALLIB) $(BASEGFXLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+=   $(CPPULIB)
+.ENDIF
 SHL1LIBS=       $(SLB)$/ipict.lib
 
 .IF "$(GUI)" != "UNX"

filter/source/graphicfilter/ipsd/makefile.mk

@@ -44,6 +44,9 @@ SLOFILES =	$(SLO)$/ipsd.obj
 SHL1TARGET= 	ipd$(DLLPOSTFIX)
 SHL1IMPLIB= 	ipsd
 SHL1STDLIBS=	$(VCLLIB) $(TOOLSLIB) $(SALLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+=   $(CPPULIB)
+.ENDIF
 SHL1LIBS=		$(SLB)$/ipsd.lib
 
 .IF "$(GUI)" != "UNX"

filter/source/graphicfilter/iras/makefile.mk

@@ -44,6 +44,9 @@ SLOFILES =	$(SLO)$/iras.obj
 SHL1TARGET= 	ira$(DLLPOSTFIX)
 SHL1IMPLIB= 	iras
 SHL1STDLIBS=	$(VCLLIB) $(TOOLSLIB) $(SALLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+=   $(CPPULIB)
+.ENDIF
 SHL1LIBS=		$(SLB)$/iras.lib
 
 .IF "$(GUI)" != "UNX"

filter/source/graphicfilter/itga/makefile.mk

@@ -44,6 +44,9 @@ SLOFILES =	$(SLO)$/itga.obj
 SHL1TARGET= 	itg$(DLLPOSTFIX)
 SHL1IMPLIB= 	itga
 SHL1STDLIBS=	$(VCLLIB) $(TOOLSLIB) $(SALLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+=   $(CPPULIB)
+.ENDIF
 SHL1LIBS=		$(SLB)$/itga.lib
 
 .IF "$(GUI)" != "UNX"

filter/source/graphicfilter/itiff/makefile.mk

@@ -48,6 +48,9 @@ EXCEPTIONSNOOPTFILES=	$(SLO)$/itiff.obj
 SHL1TARGET=     iti$(DLLPOSTFIX)
 SHL1IMPLIB=     itiff
 SHL1STDLIBS=    $(VCLLIB) $(TOOLSLIB) $(SALLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+=   $(CPPULIB)
+.ENDIF
 SHL1LIBS=       $(SLB)$/itiff.lib # $(LB)$/rtftoken.lib
 
 .IF "$(GUI)" != "UNX"

i18npool/source/textconversion/data/makefile.mk

@@ -36,6 +36,10 @@ CDEFS+=-Zm300
 
 # --- Files --------------------------------------------------------
 
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+= $(SALLIB) $(CPPULIB)
+.ENDIF
+
 # collator data library
 SHL1TARGET=$(TARGET)
 SHL1IMPLIB=i$(SHL1TARGET)