1 --- oo/tools/bootstrp/static.mk.orig Wed Jan 22 22:54:04 2003
2 +++ oo/tools/bootstrp/static.mk Wed Jan 22 22:54:27 2003
10 -# last change: $Author$ $Date$
11 +# last change: $Author$ $Date$
13 # The Contents of this file are made available subject to the terms of
14 # either of the following licenses
17 #*************************************************************************
19 +.IF "$(OFFICEUPD)"==""
22 +STATICUPD=$(OFFICEUPD)
26 # -----------------------------------------------------------
27 # --------------------- Windows32 ---------------------------
28 # -----------------------------------------------------------
30 +#.IF "$(STATICUPD)" >= 640
31 +#SALLIBST = $(SALLIB)
35 BOOTSTRP = bootstrp.lib
40 STATIC_LIBS += atools.lib
42 -.IF "$(UPD)" >= "590"
43 -STATIC_LIBS += kernel9x.lib \
46 -.IF "$(UPD)" >= "604"
47 -STATIC_LIBS += tools32.lib
50 -.IF "$(UPD)" >= "546"
51 -STATIC_LIBS += $(SALLIB)
53 -STATIC_LIBS += aosl.lib \
56 +STATIC_LIBS += uwinapi.lib \
57 + ascii_expat_xmlparse.lib \
60 .IF "$(LIBSTLPORT)" != ""
61 STATIC_LIBS += $(LIBSTLPORT)
67 -.IF "$(UPD)" >= "546"
68 -.IF "$(UPD)" >= "604"
69 -STATIC_LIBS += -lsal$(SAL_MAJOR)$(DLLPOSTFIX)
71 -STATIC_LIBS += -lsal$(UPD)$(DLLPOSTFIX)
74 -STATIC_LIBS += -losl$(UPD)$(DLLPOSTFIX) \
75 - -lrtl$(UPD)$(DLLPOSTFIX)
77 +STATIC_LIBS += -lsal$(SAL_MAJOR)$(DLLPOSTFIX) \
78 + -lascii_expat_xmlparse \
82 .IF "$(BUILD_SOSL)"==""
84 STATIC_LIBS += -lnsl -lsocket -lposix4 -lc
87 -STATIC_LIBS += -lsupc++ -lX11 -lXext
90 +.IF "$(CVER)"!="C295"
91 +STATIC_LIBS += -lsupc++ -lX11 -lXext
93 +STATIC_LIBS += -lX11 -lXext
98 # -----------------------------------------------------------
101 VERMAP = bsvermap.lib
102 STATIC_LIBS = $(L)$/atools.lib \
104 -.IF "$(UPD)" >= "546"
105 STATIC_LIBS += $(L)$/asal.lib
107 -STATIC_LIBS += $(L)$/aosl.lib \
110 # -----------------------------------------------------------