Update for Mac OS X

This commit is contained in:
Patrick Luby 2001-02-15 00:11:32 +00:00
parent 54748f685c
commit 989594437a
2 changed files with 12 additions and 5 deletions

View file

@ -2,9 +2,9 @@
# #
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.1.1.1 $ # $Revision: 1.2 $
# #
# last change: $Author: hr $ $Date: 2000-09-18 16:43:13 $ # last change: $Author: pluby $ $Date: 2001-02-15 01:11:31 $
# #
# The Contents of this file are made available subject to the terms of # The Contents of this file are made available subject to the terms of
# either of the following licenses # either of the following licenses
@ -89,12 +89,15 @@ APP1STDLIBS = $(SALLIB) \
$(CPPULIB)\ $(CPPULIB)\
$(CPPUHELPERLIB) $(CPPUHELPERLIB)
APP2OBJS = $(OBJ)$/saxdemo.obj APP2OBJS = $(OBJ)$/saxdemo.obj
APP2STDLIBS = $(SALLIB) \ APP2STDLIBS = $(SALLIB) \
$(CPPULIB) \ $(CPPULIB) \
$(CPPUHELPERLIB) $(CPPUHELPERLIB)
# SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX"
APP2OBJS+=$(OBJ)$/staticmbtest.obj
.ENDIF
# --- Targets ------------------------------------------------------ # --- Targets ------------------------------------------------------

View file

@ -2,9 +2,9 @@
# #
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.1.1.1 $ # $Revision: 1.2 $
# #
# last change: $Author: hr $ $Date: 2000-09-18 16:43:13 $ # last change: $Author: pluby $ $Date: 2001-02-15 01:11:32 $
# #
# The Contents of this file are made available subject to the terms of # The Contents of this file are made available subject to the terms of
# either of the following licenses # either of the following licenses
@ -76,6 +76,10 @@ ENABLE_EXCEPTIONS=TRUE
SLOFILES = $(SLO)$/testsax.obj \ SLOFILES = $(SLO)$/testsax.obj \
$(SLO)$/testwriter.obj $(SLO)$/testwriter.obj
# SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX"
SLOFILES+=$(SLO)$/staticmbtestsax.obj
.ENDIF
SHL1TARGET= $(TARGET) SHL1TARGET= $(TARGET)
SHL1IMPLIB= i$(TARGET) SHL1IMPLIB= i$(TARGET)