Attachment #8160 for issue #17654

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

Lines 112-123 Link Here

(-)util/makefile.mk (-2 / +10 lines)
112	SHL1VERSIONMAP= sd.map	112	SHL1VERSIONMAP= sd.map
113	SHL1IMPLIB= sdi	113	SHL1IMPLIB= sdi
114		114
		115	.IF "$(OS)"=="MACOSX"
		116	SHL1STDLIBS= $(OFALIB)
		117	.ELSE
115	# static libraries	118	# static libraries
116	SHL1STDLIBS= $(SCHLIB) $(SCLIB) $(SMLIB)	119	SHL1STDLIBS= $(SCHLIB) $(SCLIB) $(SMLIB) $(OFALIB)
		120	.ENDIF
117		121
118	# dynamic libraries	122	# dynamic libraries
119	SHL1STDLIBS+= \	123	SHL1STDLIBS+= \
120	$(OFALIB) \
121	$(SVXLIB) \	124	$(SVXLIB) \
122	$(SFXLIB) \	125	$(SFXLIB) \
123	$(BASICLIB) \	126	$(BASICLIB) \
Lines 136-141 Link Here
136	$(CPPULIB) \	139	$(CPPULIB) \
137	$(VOSLIB) \	140	$(VOSLIB) \
138	$(SALLIB)	141	$(SALLIB)
		142
		143	.IF "$(OS)"=="MACOSX"
		144	# static libs at end for OS X
		145	SHL1STDLIBS+= $(SCHLIB) $(SCLIB) $(SMLIB)
		146	.ENDIF
139		147
140	.IF "$(GUI)" == "MAC"	148	.IF "$(GUI)" == "MAC"
141	SHL1STDLIBS += \	149	SHL1STDLIBS += \

Return to issue 17654