diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-12-09 08:43:20 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-12-09 08:43:20 +0000 |
commit | c1076fbc24ef3b9ac3814a2a4bd380ce5e4b39c2 (patch) | |
tree | 9d264ea3b541a15af8883a14d8a1e85a87bd09dc /writerfilter | |
parent | 56a3f97ee75f4a833ba95ceee6f86d4044af132d (diff) |
CWS-TOOLING: integrate CWS os2port04
2008-11-27 13:22:38 +0100 ydario r264480 : #i96439#: fix build for unix platforms.
2008-11-26 18:32:42 +0100 ydario r264433 : #i96439#: os2 systemshell code (dummy code).
2008-11-26 16:33:48 +0100 ydario r264421 : #i96439#: vcl fix for pdf export of truetype fonts.
2008-11-26 15:04:44 +0100 ydario r264399 : #i96439#: build macros fix scripts, gcc specific flags.
2008-11-26 15:00:15 +0100 ydario r264398 : #i96439#: vcl source code updates.
2008-11-26 13:21:37 +0100 ydario r264378 : #i96439#: os2 build system fixes.
2008-11-26 13:20:27 +0100 ydario r264377 : #i96439#: configuration and build macros updates.
2008-11-26 13:16:35 +0100 ydario r264375 : #i96439#: new launcher code, build system updates.
2008-11-26 13:12:49 +0100 ydario r264373 : #i96439#: use OSL endian macro.
2008-11-26 12:54:50 +0100 ydario r264371 : #i96439#: os2 build system fixes.
2008-11-26 12:30:46 +0100 ydario r264367 : #i96439#: os2 build system fixes.
2008-11-26 12:09:33 +0100 ydario r264365 : #i96439#: _Export is a reserved keyword under gcc for os2.
2008-11-26 12:08:12 +0100 ydario r264364 : #i96439#: new libpath handling.
2008-11-26 11:57:51 +0100 ydario r264363 : #i96439#: use C call, generates proper stabs; fix rtti names.
Diffstat (limited to 'writerfilter')
-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 |
4 files changed, 15 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 |