Attachment #51057 for issue #85437

View | Details | Raw Unified | Return to issue 85437
Collapse All | Expand All

Lines 82-89 Link Here

(-)ooo_src680_m243/writerfilter/source/doctok/makefile.mk.orig (+4 lines)
82	.IF "$(GUI)"=="UNX" \|\| "$(GUI)"=="MAC"	82	.IF "$(GUI)"=="UNX" \|\| "$(GUI)"=="MAC"
83	RESOURCEMODELLIB=-lresourcemodel	83	RESOURCEMODELLIB=-lresourcemodel
84	.ELIF "$(GUI)"=="WNT"	84	.ELIF "$(GUI)"=="WNT"
		85	.IF "$(COM)"=="GCC"
		86	RESOURCEMODELLIB=-lresourcemodel
		87	.ELSE
85	RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib	88	RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
86	.ENDIF	89	.ENDIF
		90	.ENDIF
87		91
88		92
89	SHL1STDLIBS=$(SALLIB)\	93	SHL1STDLIBS=$(SALLIB)\

Lines 95-102 Link Here

(-)ooo_src680_m243/writerfilter/source/ooxml/makefile.mk.orig (+4 lines)
95	.IF "$(GUI)"=="UNX" \|\| "$(GUI)"=="MAC"	95	.IF "$(GUI)"=="UNX" \|\| "$(GUI)"=="MAC"
96	RESOURCEMODELLIB=-lresourcemodel	96	RESOURCEMODELLIB=-lresourcemodel
97	.ELIF "$(GUI)"=="WNT"	97	.ELIF "$(GUI)"=="WNT"
		98	.IF "$(COM)"=="GCC"
		99	RESOURCEMODELLIB=-lresourcemodel
		100	.ELSE
98	RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib	101	RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
99	.ENDIF	102	.ENDIF
		103	.ENDIF
100		104
101	SHL1STDLIBS=$(SALLIB)\	105	SHL1STDLIBS=$(SALLIB)\
102	$(CPPULIB)\	106	$(CPPULIB)\




OOXMLLIB=-looxml
RESOURCEMODELLIB=-lresourcemodel
.ELIF "$(GUI)"=="WNT"
.IF "$(COM)"=="GCC"
ODIAPILIB=-lodiapi
RTFTOKLIB=-lrtftok
DOCTOKLIB=-ldoctok
OOXMLLIB=-looxml
RESOURCEMODELLIB=-lresourcemodel
.ELSE
ODIAPILIB=$(LB)$/iodiapi.lib
RTFTOKLIB=$(LB)$/irtftok.lib
DOCTOKLIB=$(LB)$/idoctok.lib
OOXMLLIB=$(LB)$/iooxml.lib
RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
.ENDIF
.ENDIF

SHL1STDLIBS=$(SALLIB)\
	$(CPPULIB)\

Lines 43-50 Link Here

(-)ooo_src680_m243/writerfilter/unocomponent/debugservices/ooxml/makefile.mk.orig (+4 lines)
43	.IF "$(GUI)"=="UNX" \|\| "$(GUI)"=="MAC"	43	.IF "$(GUI)"=="UNX" \|\| "$(GUI)"=="MAC"
44	RESSOUREMODELLIB=-lresourcemodel	44	RESSOUREMODELLIB=-lresourcemodel
45	.ELIF "$(GUI)"=="WNT"	45	.ELIF "$(GUI)"=="WNT"
		46	.IF "$(COM)"=="GCC"
		47	RESOURCEMODELLIB=-lresourcemodel
		48	.ELSE
46	RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib	49	RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
47	.ENDIF	50	.ENDIF
		51	.ENDIF
48		52
49	SHL1STDLIBS= \	53	SHL1STDLIBS= \
50	$(COMPHELPERLIB) \	54	$(COMPHELPERLIB) \

Return to issue 85437

Lines 56-67 Link Here

(-)ooo_src680_m243/writerfilter/unocomponent/makefile.mk.orig (+8 lines)
56	OOXMLLIB=-looxml	56	OOXMLLIB=-looxml
57	RESOURCEMODELLIB=-lresourcemodel	57	RESOURCEMODELLIB=-lresourcemodel
58	.ELIF "$(GUI)"=="WNT"	58	.ELIF "$(GUI)"=="WNT"
		59	.IF "$(COM)"=="GCC"
		60	ODIAPILIB=-lodiapi
		61	RTFTOKLIB=-lrtftok
		62	DOCTOKLIB=-ldoctok
		63	OOXMLLIB=-looxml
		64	RESOURCEMODELLIB=-lresourcemodel
		65	.ELSE
59	ODIAPILIB=$(LB)$/iodiapi.lib	66	ODIAPILIB=$(LB)$/iodiapi.lib
60	RTFTOKLIB=$(LB)$/irtftok.lib	67	RTFTOKLIB=$(LB)$/irtftok.lib
61	DOCTOKLIB=$(LB)$/idoctok.lib	68	DOCTOKLIB=$(LB)$/idoctok.lib
62	OOXMLLIB=$(LB)$/iooxml.lib	69	OOXMLLIB=$(LB)$/iooxml.lib
63	RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib	70	RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
64	.ENDIF	71	.ENDIF
		72	.ENDIF
65		73
66	SHL1STDLIBS=$(SALLIB)\	74	SHL1STDLIBS=$(SALLIB)\
67	$(CPPULIB)\	75	$(CPPULIB)\