Attachment #8149 for issue #17643

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

Lines 82-87 Link Here

(-)source/javaldx/makefile.mk (+3 lines)
82	APP1TARGET=javaldx	82	APP1TARGET=javaldx
83	APP1OBJS=$(OBJFILES)	83	APP1OBJS=$(OBJFILES)
84	APP1STDLIBS=$(SALLIB) $(CPPULIB) $(JVMACCESSLIB)	84	APP1STDLIBS=$(SALLIB) $(CPPULIB) $(JVMACCESSLIB)
		85	.IF "$(OS)"=="MACOSX"
		86	APP1STDLIBS+= -lstdc++
		87	.ENDIF
85		88
86	# --- Targets ------------------------------------------------------	89	# --- Targets ------------------------------------------------------
87		90




#	$(SMLIB)  $(SO2LIB) $(SOTLIB) $(VOSLIB) \
#	$(SWLIB)  $(SO2LIB) $(SOTLIB) $(VOSLIB) \

.IF "$(OS)"!="MACOSX"
SHL1STDLIBS= \
	$(SCHLIB)	\
	$(SCLIB) \
	$(UNOTOOLSLIB)
.ELSE
SHL1STDLIBS= $(UNOTOOLSLIB)
.ENDIF

SHL1STDLIBS+= \
	$(SDLIB)	\
	$(SVTOOLLIB)	\
	$(SMLIB)	\
	$(SWLIB)	\
	\
	$(SO2LIB)	\
	$(SOTLIB)	\
	$(VOSLIB)	\
	\
	$(OFALIB)	\
	$(SVXLIB)	\
	$(SFX2LIB) 	\

	$(CPPUHELPERLIB)	\
	$(CPPULIB)	\
	$(SALLIB)

.IF "$(OS)"=="MACOSX"
SHL1STDLIBS+= $(SCLIB) $(SCHLIB)
.ENDIF

# --- Targets ------------------------------------------------------


Return to issue 17643

Lines 94-110 Link Here

(-)source/offwrp/makefile.mk (-4 / +14 lines)
94	# $(SMLIB) $(SO2LIB) $(SOTLIB) $(VOSLIB) \	94	# $(SMLIB) $(SO2LIB) $(SOTLIB) $(VOSLIB) \
95	# $(SWLIB) $(SO2LIB) $(SOTLIB) $(VOSLIB) \	95	# $(SWLIB) $(SO2LIB) $(SOTLIB) $(VOSLIB) \
96		96
		97	.IF "$(OS)"!="MACOSX"
97	SHL1STDLIBS= \	98	SHL1STDLIBS= \
98	$(SCHLIB) \	99	$(SCHLIB) \
99	$(SCLIB) $(UNOTOOLSLIB) \	100	$(SCLIB) \
100	$(SDLIB) $(SVTOOLLIB) \	101	$(UNOTOOLSLIB)
		102	.ELSE
		103	SHL1STDLIBS= $(UNOTOOLSLIB)
		104	.ENDIF
		105
		106	SHL1STDLIBS+= \
		107	$(SDLIB) \
		108	$(SVTOOLLIB) \
101	$(SMLIB) \	109	$(SMLIB) \
102	$(SWLIB) \	110	$(SWLIB) \
103	\
104	$(SO2LIB) \	111	$(SO2LIB) \
105	$(SOTLIB) \	112	$(SOTLIB) \
106	$(VOSLIB) \	113	$(VOSLIB) \
107	\
108	$(OFALIB) \	114	$(OFALIB) \
109	$(SVXLIB) \	115	$(SVXLIB) \
110	$(SFX2LIB) \	116	$(SFX2LIB) \
Lines 116-121 Link Here
116	$(CPPUHELPERLIB) \	122	$(CPPUHELPERLIB) \
117	$(CPPULIB) \	123	$(CPPULIB) \
118	$(SALLIB)	124	$(SALLIB)
		125
		126	.IF "$(OS)"=="MACOSX"
		127	SHL1STDLIBS+= $(SCLIB) $(SCHLIB)
		128	.ENDIF
119		129
120	# --- Targets ------------------------------------------------------	130	# --- Targets ------------------------------------------------------
121		131