Attachment #8166 for issue #17660

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




	$(SLB)$/ui1.lib\
	$(SLB)$/ui2.lib

.IF "$(OS)"!="MACOSX"
# static libraries
SHL2STDLIBS+= $(SCHLIB) $(SMLIB)
.ENDIF

# dynamic libraries
SHL2STDLIBS+= \

	$(SOTLIB) \
	$(UNOTOOLSLIB) \
	$(TOOLSLIB) \
	$(COMPHELPERLIB) \
	$(UCBHELPERLIB) \
	$(CPPUHELPERLIB) \
	$(CPPULIB) \
	$(VOSLIB) \
	$(SALLIB) \
	$(ICUUCLIB)

.IF "$(OS)"=="MACOSX"
# static libraries at end for OS X
SHL2STDLIBS+= $(SCHLIB) $(SMLIB)
.ENDIF

.IF "$(GUI)"=="WNT"
SHL2STDLIBS+= advapi32.lib

Return to issue 17660

Lines 166-173 Link Here

(-)util/makefile.mk (-2 / +9 lines)
166	$(SLB)$/ui1.lib\	166	$(SLB)$/ui1.lib\
167	$(SLB)$/ui2.lib	167	$(SLB)$/ui2.lib
168		168
		169	.IF "$(OS)"!="MACOSX"
169	# static libraries	170	# static libraries
170	SHL2STDLIBS+= $(SCHLIB) $(SMLIB)	171	SHL2STDLIBS+= $(SCHLIB) $(SMLIB)
		172	.ENDIF
171		173
172	# dynamic libraries	174	# dynamic libraries
173	SHL2STDLIBS+= \	175	SHL2STDLIBS+= \
Lines 185-197 Link Here
185	$(SOTLIB) \	187	$(SOTLIB) \
186	$(UNOTOOLSLIB) \	188	$(UNOTOOLSLIB) \
187	$(TOOLSLIB) \	189	$(TOOLSLIB) \
188	$(COMPHELPERLIB) \	190	$(COMPHELPERLIB) \
189	$(UCBHELPERLIB) \	191	$(UCBHELPERLIB) \
190	$(CPPUHELPERLIB) \	192	$(CPPUHELPERLIB) \
191	$(CPPULIB) \	193	$(CPPULIB) \
192	$(VOSLIB) \	194	$(VOSLIB) \
193	$(SALLIB) \	195	$(SALLIB) \
194	$(ICUUCLIB)	196	$(ICUUCLIB)
		197
		198	.IF "$(OS)"=="MACOSX"
		199	# static libraries at end for OS X
		200	SHL2STDLIBS+= $(SCHLIB) $(SMLIB)
		201	.ENDIF
195		202
196	.IF "$(GUI)"=="WNT"	203	.IF "$(GUI)"=="WNT"
197	SHL2STDLIBS+= advapi32.lib	204	SHL2STDLIBS+= advapi32.lib