Author: ydario
Date: Thu Feb 20 15:29:34 2014
New Revision: 1570225
URL: http://svn.apache.org/r1570225
Log:
#i118923# OS/2 port, add CPPULIB to resolve uno constructors.
Modified:
openoffice/trunk/main/filter/source/graphicfilter/eras/makefile.mk
openoffice/trunk/main/filter/source/graphicfilter/etiff/makefile.mk
openoffice/trunk/main/filter/source/graphicfilter/expm/makefile.mk
openoffice/trunk/main/filter/source/graphicfilter/idxf/makefile.mk
openoffice/trunk/main/filter/source/graphicfilter/ieps/makefile.mk
openoffice/trunk/main/filter/source/graphicfilter/ios2met/makefile.mk
openoffice/trunk/main/filter/source/graphicfilter/ipbm/makefile.mk
openoffice/trunk/main/filter/source/graphicfilter/ipcd/makefile.mk
openoffice/trunk/main/filter/source/graphicfilter/ipcx/makefile.mk
openoffice/trunk/main/filter/source/graphicfilter/ipict/makefile.mk
openoffice/trunk/main/filter/source/graphicfilter/ipsd/makefile.mk
openoffice/trunk/main/filter/source/graphicfilter/iras/makefile.mk
openoffice/trunk/main/filter/source/graphicfilter/itga/makefile.mk
openoffice/trunk/main/filter/source/graphicfilter/itiff/makefile.mk
openoffice/trunk/main/i18npool/source/textconversion/data/makefile.mk
Modified: openoffice/trunk/main/filter/source/graphicfilter/eras/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/graphicfilter/eras/makefile.mk?rev=1570225&r1=1570224&r2=1570225&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/graphicfilter/eras/makefile.mk
(original)
+++ openoffice/trunk/main/filter/source/graphicfilter/eras/makefile.mk Thu Feb
20 15:29:34 2014
@@ -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"
Modified: openoffice/trunk/main/filter/source/graphicfilter/etiff/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/graphicfilter/etiff/makefile.mk?rev=1570225&r1=1570224&r2=1570225&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/graphicfilter/etiff/makefile.mk
(original)
+++ openoffice/trunk/main/filter/source/graphicfilter/etiff/makefile.mk Thu Feb
20 15:29:34 2014
@@ -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"
Modified: openoffice/trunk/main/filter/source/graphicfilter/expm/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/graphicfilter/expm/makefile.mk?rev=1570225&r1=1570224&r2=1570225&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/graphicfilter/expm/makefile.mk
(original)
+++ openoffice/trunk/main/filter/source/graphicfilter/expm/makefile.mk Thu Feb
20 15:29:34 2014
@@ -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"
Modified: openoffice/trunk/main/filter/source/graphicfilter/idxf/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/graphicfilter/idxf/makefile.mk?rev=1570225&r1=1570224&r2=1570225&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/graphicfilter/idxf/makefile.mk
(original)
+++ openoffice/trunk/main/filter/source/graphicfilter/idxf/makefile.mk Thu Feb
20 15:29:34 2014
@@ -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
Modified: openoffice/trunk/main/filter/source/graphicfilter/ieps/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/graphicfilter/ieps/makefile.mk?rev=1570225&r1=1570224&r2=1570225&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/graphicfilter/ieps/makefile.mk
(original)
+++ openoffice/trunk/main/filter/source/graphicfilter/ieps/makefile.mk Thu Feb
20 15:29:34 2014
@@ -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"
Modified: openoffice/trunk/main/filter/source/graphicfilter/ios2met/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/graphicfilter/ios2met/makefile.mk?rev=1570225&r1=1570224&r2=1570225&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/graphicfilter/ios2met/makefile.mk
(original)
+++ openoffice/trunk/main/filter/source/graphicfilter/ios2met/makefile.mk Thu
Feb 20 15:29:34 2014
@@ -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
Modified: openoffice/trunk/main/filter/source/graphicfilter/ipbm/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/graphicfilter/ipbm/makefile.mk?rev=1570225&r1=1570224&r2=1570225&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/graphicfilter/ipbm/makefile.mk
(original)
+++ openoffice/trunk/main/filter/source/graphicfilter/ipbm/makefile.mk Thu Feb
20 15:29:34 2014
@@ -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"
Modified: openoffice/trunk/main/filter/source/graphicfilter/ipcd/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/graphicfilter/ipcd/makefile.mk?rev=1570225&r1=1570224&r2=1570225&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/graphicfilter/ipcd/makefile.mk
(original)
+++ openoffice/trunk/main/filter/source/graphicfilter/ipcd/makefile.mk Thu Feb
20 15:29:34 2014
@@ -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"
Modified: openoffice/trunk/main/filter/source/graphicfilter/ipcx/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/graphicfilter/ipcx/makefile.mk?rev=1570225&r1=1570224&r2=1570225&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/graphicfilter/ipcx/makefile.mk
(original)
+++ openoffice/trunk/main/filter/source/graphicfilter/ipcx/makefile.mk Thu Feb
20 15:29:34 2014
@@ -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"
Modified: openoffice/trunk/main/filter/source/graphicfilter/ipict/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/graphicfilter/ipict/makefile.mk?rev=1570225&r1=1570224&r2=1570225&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/graphicfilter/ipict/makefile.mk
(original)
+++ openoffice/trunk/main/filter/source/graphicfilter/ipict/makefile.mk Thu Feb
20 15:29:34 2014
@@ -44,6 +44,9 @@ SLOFILES = $(SLO)$/ipict.obj $(SLO)$/sh
SHL1TARGET= ipt$(DLLPOSTFIX)
SHL1IMPLIB= ipict
SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB) $(BASEGFXLIB)
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+= $(CPPULIB)
+.ENDIF
SHL1LIBS= $(SLB)$/ipict.lib
.IF "$(GUI)" != "UNX"
Modified: openoffice/trunk/main/filter/source/graphicfilter/ipsd/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/graphicfilter/ipsd/makefile.mk?rev=1570225&r1=1570224&r2=1570225&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/graphicfilter/ipsd/makefile.mk
(original)
+++ openoffice/trunk/main/filter/source/graphicfilter/ipsd/makefile.mk Thu Feb
20 15:29:34 2014
@@ -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"
Modified: openoffice/trunk/main/filter/source/graphicfilter/iras/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/graphicfilter/iras/makefile.mk?rev=1570225&r1=1570224&r2=1570225&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/graphicfilter/iras/makefile.mk
(original)
+++ openoffice/trunk/main/filter/source/graphicfilter/iras/makefile.mk Thu Feb
20 15:29:34 2014
@@ -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"
Modified: openoffice/trunk/main/filter/source/graphicfilter/itga/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/graphicfilter/itga/makefile.mk?rev=1570225&r1=1570224&r2=1570225&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/graphicfilter/itga/makefile.mk
(original)
+++ openoffice/trunk/main/filter/source/graphicfilter/itga/makefile.mk Thu Feb
20 15:29:34 2014
@@ -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"
Modified: openoffice/trunk/main/filter/source/graphicfilter/itiff/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/graphicfilter/itiff/makefile.mk?rev=1570225&r1=1570224&r2=1570225&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/graphicfilter/itiff/makefile.mk
(original)
+++ openoffice/trunk/main/filter/source/graphicfilter/itiff/makefile.mk Thu Feb
20 15:29:34 2014
@@ -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"
Modified: openoffice/trunk/main/i18npool/source/textconversion/data/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/i18npool/source/textconversion/data/makefile.mk?rev=1570225&r1=1570224&r2=1570225&view=diff
==============================================================================
--- openoffice/trunk/main/i18npool/source/textconversion/data/makefile.mk
(original)
+++ openoffice/trunk/main/i18npool/source/textconversion/data/makefile.mk Thu
Feb 20 15:29:34 2014
@@ -36,6 +36,10 @@ CDEFS+=-Zm300
# --- Files --------------------------------------------------------
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+= $(SALLIB) $(CPPULIB)
+.ENDIF
+
# collator data library
SHL1TARGET=$(TARGET)
SHL1IMPLIB=i$(SHL1TARGET)
