|
Lines 117-124
Link Here
|
| 117 |
SHL2IMPLIB= _$(TARGET) |
117 |
SHL2IMPLIB= _$(TARGET) |
| 118 |
SHL2LIBS= $(SLB)$/$(TARGET).lib |
118 |
SHL2LIBS= $(SLB)$/$(TARGET).lib |
| 119 |
|
119 |
|
|
|
120 |
.IF "$(OS)"=="MACOSX" |
| 121 |
# Static libs must go at end of library list |
| 122 |
SHL2STDLIBS= $(BASICLIB) \ |
| 123 |
$(SVXLIB) |
| 124 |
.ELSE |
| 120 |
# static libraries |
125 |
# static libraries |
| 121 |
SHL2STDLIBS= $(BASICIDELIB) |
126 |
SHL2STDLIBS= $(BASICIDELIB) \ |
|
|
127 |
$(SVXLIB) \ |
| 128 |
$(BASICLIB) |
| 129 |
.ENDIF |
| 122 |
|
130 |
|
| 123 |
#.IF "$(GUI)"=="UNX" |
131 |
#.IF "$(GUI)"=="UNX" |
| 124 |
#SHL2STDLIBS+= \ |
132 |
#SHL2STDLIBS+= \ |
|
Lines 128-136
Link Here
|
| 128 |
|
136 |
|
| 129 |
# dynamic libraries |
137 |
# dynamic libraries |
| 130 |
SHL2STDLIBS+= \ |
138 |
SHL2STDLIBS+= \ |
| 131 |
$(SVXLIB) \ |
|
|
| 132 |
$(SFX2LIB) \ |
139 |
$(SFX2LIB) \ |
| 133 |
$(BASICLIB) \ |
|
|
| 134 |
$(GOODIESLIB) \ |
140 |
$(GOODIESLIB) \ |
| 135 |
$(SVTOOLLIB) \ |
141 |
$(SVTOOLLIB) \ |
| 136 |
$(SVLLIB) \ |
142 |
$(SVLLIB) \ |
|
Lines 142-147
Link Here
|
| 142 |
$(CPPULIB) \ |
148 |
$(CPPULIB) \ |
| 143 |
$(VOSLIB) \ |
149 |
$(VOSLIB) \ |
| 144 |
$(SALLIB) |
150 |
$(SALLIB) |
|
|
151 |
|
| 152 |
.IF "$(OS)"=="MACOSX" |
| 153 |
SHL2STDLIBS+= $(BASICIDELIB) |
| 154 |
.ENDIF |
| 145 |
|
155 |
|
| 146 |
.IF "$(GUI)"=="WNT" |
156 |
.IF "$(GUI)"=="WNT" |
| 147 |
SHL2STDLIBS += $(LIBPRE) advapi32.lib |
157 |
SHL2STDLIBS += $(LIBPRE) advapi32.lib |