diff options
| -rw-r--r-- | writerfilter/source/doctok/makefile.mk | 2 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/makefile.mk | 2 | ||||
| -rw-r--r-- | writerfilter/source/resourcemodel/makefile.mk | 14 | ||||
| -rw-r--r-- | writerfilter/unocomponent/makefile.mk | 4 | ||||
| -rw-r--r-- | writerperfect/prj/d.lst | 1 |
5 files changed, 16 insertions, 7 deletions
diff --git a/writerfilter/source/doctok/makefile.mk b/writerfilter/source/doctok/makefile.mk index ebced8214c1e..1c9a4f333f9f 100644 --- a/writerfilter/source/doctok/makefile.mk +++ b/writerfilter/source/doctok/makefile.mk @@ -79,6 +79,8 @@ SHL1TARGET=$(TARGET) .IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" RESOURCEMODELLIB=-lresourcemodel +.ELIF "$(GUI)"=="OS2" +RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib .ELIF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" RESOURCEMODELLIB=-lresourcemodel diff --git a/writerfilter/source/ooxml/makefile.mk b/writerfilter/source/ooxml/makefile.mk index 510ef162f9a2..c3814426aa7f 100644 --- a/writerfilter/source/ooxml/makefile.mk +++ b/writerfilter/source/ooxml/makefile.mk @@ -94,6 +94,8 @@ SHL1TARGET=$(TARGET) .IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" RESOURCEMODELLIB=-lresourcemodel +.ELIF "$(GUI)"=="OS2" +RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib .ELIF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" RESOURCEMODELLIB=-lresourcemodel diff --git a/writerfilter/source/resourcemodel/makefile.mk b/writerfilter/source/resourcemodel/makefile.mk index d731dbbf42aa..3303c15007c0 100644 --- a/writerfilter/source/resourcemodel/makefile.mk +++ b/writerfilter/source/resourcemodel/makefile.mk @@ -141,15 +141,15 @@ GENERATEDFILES= \ $(SPRMCODETOSTRTMP) $(OOXMLQNAMETOSTRTMP): $(OOXMLQNAMETOSTRXSL) $(MODELPROCESSED) - $(XSLTPROC) $(OOXMLQNAMETOSTRXSL) $(MODELPROCESSED) > $@ + $(XSLTPROC) $(OOXMLQNAMETOSTRXSL:s!\!/!) $(MODELPROCESSED) > $@ $(DOCTOKQNAMETOSTRTMP): $(DOCTOKQNAMETOSTRXSL) $(DOCTOKMODEL) - $(XSLTPROC) $(DOCTOKQNAMETOSTRXSL) $(DOCTOKMODEL) > $@ + $(XSLTPROC) $(DOCTOKQNAMETOSTRXSL:s!\!/!) $(DOCTOKMODEL) > $@ $(QNAMETOSTRCXX): $(OOXMLQNAMETOSTRTMP) $(DOCTOKQNAMETOSTRTMP) qnametostrheader qnametostrfooter $(OOXMLRESOURCESTOOLSXSL) $(DOCTOKRESOURCETOOLS) $(TYPE) qnametostrheader $(OOXMLQNAMETOSTRTMP) $(DOCTOKQNAMETOSTRTMP) qnametostrfooter > $@ $(SPRMCODETOSTRTMP): $(DOCTOKSPRMCODETOSTRXSL) $(DOCTOKMODEL) - $(XSLTPROC) $(DOCTOKSPRMCODETOSTRXSL) $(DOCTOKMODEL) > $@ + $(XSLTPROC) $(DOCTOKSPRMCODETOSTRXSL:s!\!/!) $(DOCTOKMODEL) > $@ $(SPRMCODETOSTRCXX): sprmcodetostrheader $(SPRMCODETOSTRTMP) sprmcodetostrfooter $(TYPE) $< > $@ @@ -164,20 +164,20 @@ $(DOCTOKHXXOUTDIRCREATED): $(TOUCH) $@ $(DOCTOKRESOURCEIDSHXX): $(DOCTOKHXXOUTDIRCREATED) $(DOCTOKRESOURCETOOLS) $(DOCTOKRESOURCEIDSXSL) - $(XSLTPROC) $(DOCTOKRESOURCEIDSXSL) $(DOCTOKMODEL) > $@ + $(XSLTPROC) $(DOCTOKRESOURCEIDSXSL:s!\!/!) $(DOCTOKMODEL) > $@ $(OOXMLHXXOUTDIRCREATED): $(MKDIRHIER) $(OOXMLHXXOUTDIR) $(TOUCH) $@ $(MODELPROCESSED): $(OOXMLMODEL) $(OOXMLRESOURCESTOOLSXSL) $(OOXMLPREPROCESSXSL) - $(XSLTPROC) $(OOXMLPREPROCESSXSL) $(OOXMLMODEL) > $@ + $(XSLTPROC) $(OOXMLPREPROCESSXSL:s!\!/!) $(OOXMLMODEL) > $@ $(OOXMLRESOURCEIDSHXX): $(OOXMLHXXOUTDIRCREATED) $(OOXMLRESOURCESTOOLSXSL) $(OOXMLRESOURCEIDSXSL) $(MODELPROCESSED) - $(XSLTPROC) $(OOXMLRESOURCEIDSXSL) $(MODELPROCESSED) > $@ + $(XSLTPROC) $(OOXMLRESOURCEIDSXSL:s!\!/!) $(MODELPROCESSED) > $@ $(SPRMIDSHXX): $(DOCTOKHXXOUTDIRCREATED) $(DOCTOKSPRMIDSXSL) $(DOCTOKMODEL) - $(XSLTPROC) $(DOCTOKSPRMIDSXSL) $(DOCTOKMODEL) > $@ + $(XSLTPROC) $(DOCTOKSPRMIDSXSL:s!\!/!) $(DOCTOKMODEL) > $@ .PHONY: genclean genmake gendirs diff --git a/writerfilter/unocomponent/makefile.mk b/writerfilter/unocomponent/makefile.mk index 0e1fd3c4b85d..45dc37bb2540 100644 --- a/writerfilter/unocomponent/makefile.mk +++ b/writerfilter/unocomponent/makefile.mk @@ -50,6 +50,10 @@ SHL1TARGET=$(TARGET) DOCTOKLIB=-ldoctok OOXMLLIB=-looxml RESOURCEMODELLIB=-lresourcemodel +.ELIF "$(GUI)"=="OS2" +DOCTOKLIB=$(LB)$/idoctok.lib +OOXMLLIB=$(LB)$/iooxml.lib +RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib .ELIF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" DOCTOKLIB=-ldoctok diff --git a/writerperfect/prj/d.lst b/writerperfect/prj/d.lst index 1a88e14704af..7cd3b89ad092 100644 --- a/writerperfect/prj/d.lst +++ b/writerperfect/prj/d.lst @@ -1,3 +1,4 @@ ..\%__SRC%\lib\libwpft*.so %_DEST%\lib%_EXT% ..\%__SRC%\bin\wpft*.dll %_DEST%\lib%_EXT% +..\%__SRC%\bin\wpftgo.dll %_DEST%\bin%_EXT%\wpftgo.dll ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib |